[Demudi-commits] r1334 - in om/trunk: debian src src/engine

[Joost Damad]

Author: andete-guest
Date: 2007-05-12 15:09:02 +0000 (Sat, 12 May 2007)
New Revision: 1334

Added:
   om/trunk/src/engine/
   om/trunk/src/engine/NodeFactory.h
Modified:
   om/trunk/debian/changelog
Log:
bugfix


Modified: om/trunk/debian/changelog
===================================================================
--- om/trunk/debian/changelog	2007-05-12 14:57:52 UTC (rev 1333)
+++ om/trunk/debian/changelog	2007-05-12 15:09:02 UTC (rev 1334)
@@ -1,3 +1,9 @@
+om (0.2.0-3) unstable; urgency=low
+
+  * Fix FTBFS with gcc-.4.3 (Closes: #421123)
+
+ -- Joost Yervante Damad <andete at debian.org>  Sat, 12 May 2007 17:08:10 +0200
+
 om (0.2.0-2) unstable; urgency=low
 
   [Joost Yervante Damad]

Added: om/trunk/src/engine/NodeFactory.h
===================================================================
--- om/trunk/src/engine/NodeFactory.h	2007-05-12 14:57:52 UTC (rev 1333)
+++ om/trunk/src/engine/NodeFactory.h	2007-05-12 15:09:02 UTC (rev 1334)
@@ -0,0 +1,89 @@
+/* This file is part of Om.  Copyright (C) 2005 Dave Robillard.
+ * 
+ * Om is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * 
+ * Om is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef NODEFACTORY_H
+#define NODEFACTORY_H
+
+#include "config.h"
+#include <cstdlib>
+#include <list>
+#include <string>
+#include <ladspa.h>
+#include <pthread.h>
+
+using std::string; using std::list;
+
+namespace Om {
+
+class Node;
+class PortInfo;
+class Patch;
+class PluginLibrary;
+class Plugin;
+
+
+/** Loads plugins and creates Nodes from them.
+ *
+ * NodeFactory's responsibility is to get enough information to allow the 
+ * loading of a plugin possible (ie finding/opening shared libraries etc)
+ *
+ * The constructor of various Node types (ie LADSPAPlugin) are responsible
+ * for actually creating a Node instance of the plugin.
+ *
+ * \ingroup engine
+ */
+class NodeFactory
+{
+public:
+	NodeFactory();
+	~NodeFactory();
+
+	void  load_plugins();
+	Node* load_plugin(const Plugin* info, const string& name, uint poly, Patch* parent);
+	
+	const list<Plugin*>& plugins() { return m_plugins; }
+	
+	void lock_plugin_list()   { pthread_mutex_lock(&m_plugin_list_mutex); }
+	void unlock_plugin_list() { pthread_mutex_unlock(&m_plugin_list_mutex); }
+	
+private:
+#ifdef HAVE_LADSPA
+	void load_ladspa_plugins();
+	Node* load_ladspa_plugin(const string& lib_name, const string& plug_name, const string& name, uint poly, Patch* parent);
+#endif
+	
+#ifdef HAVE_DSSI
+	void load_dssi_plugins();
+	Node* load_dssi_plugin(const string& lib_name, const string& plug_name, const string& name, uint poly, Patch* parent);
+#endif
+	
+	Node* load_internal_plugin(const string& plug_label, const string& name, uint poly, Patch* parent);
+	
+	list<PluginLibrary*> m_libraries;
+	list<Plugin*>        m_internal_plugins;
+	list<Plugin*>        m_plugins;
+
+	/** Used to protect the list while load_plugins is building it. */
+	pthread_mutex_t m_plugin_list_mutex;
+
+	bool m_has_loaded;
+};
+
+
+} // namespace Om
+
+#endif // NODEFACTORY_H