Lash D-Bus support and projects list from LADI Patchage, with improvements/cleanup/sanification/etc.

Remove liblash stuff (meh, what the hell...  here's to new beginnings).
Enable/disable/hide/etc patchage widgets better based on available (compiled in) functionality.


git-svn-id: http://svn.drobilla.net/lad/raul@1462 a436a847-0d15-0410-975c-d299462d15a1

6 files changed, 2 insertions, 207 deletions

diff --git a/configure.ac b/configure.ac
index 04af390..780ab47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,22 +143,6 @@ if test "$build_jack" = "yes"; then
 	AC_DEFINE(HAVE_JACK_MIDI, 1, [Has Jack MIDI])
 fi
 
-# LASH support
-build_lash="yes"
-AC_ARG_ENABLE(lash,
-	[AS_HELP_STRING(--enable-lash, [Enable LASH session management support (yes)])],
-	[ if test x$enable_lash = xno ; then build_lash=no ; fi ])
-	
-have_lash="no"
-if test "$build_lash" = "yes"; then
-	PKG_CHECK_MODULES(LASH, lash-1.0 >= 0.5.2, have_lash="yes", have_lash="no")
-fi
-if test "$have_lash" = "yes"; then
-	AC_DEFINE(HAVE_LASH, 1, [Has lash.h])
-else
-	AC_MSG_WARN([LASH not found, session support will not be built.])
-fi
-
 # Build documentation
 build_documentation="yes"
 AC_ARG_ENABLE(documentation,
@@ -208,7 +192,6 @@ AC_MSG_RESULT([*****************************************************************
 AC_MSG_RESULT([Configuration:])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Jack support:     $build_jack])
-AC_MSG_RESULT([LASH support:     $build_lash])
 AC_MSG_RESULT([Build unit tests: $build_unit_tests])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([C FLAGS:   $CFLAGS])
diff --git a/raul/LashClient.hpp b/raul/LashClient.hpp
deleted file mode 100644
index 69ab618..0000000
--- a/raul/LashClient.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This file is part of Raul.
- * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
- * 
- * Raul 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.
- * 
- * Raul 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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RAUL_LASH_CLIENT_HPP
-#define RAUL_LASH_CLIENT_HPP
-
-#include <string>
-#include <boost/enable_shared_from_this.hpp>
-#include <lash/lash.h>
-#include <raul/SharedPtr.hpp>
-
-namespace Raul {
-
-
-class LashClient : public boost::enable_shared_from_this<LashClient> {
-public:
-	virtual ~LashClient();
-
-	static SharedPtr<LashClient> create(
-			lash_args_t*       args,
-	        const std::string& name,
-	        int                flags);
-	
-	lash_client_t* lash_client() { return _lash_client; };
-
-	bool enabled() { return lash_enabled(_lash_client); }
-
-	void process_events();
-
-protected:
-	LashClient(lash_client_t* client);
-	
-	virtual void handle_event(lash_event_t*)   {}
-	virtual void handle_config(lash_config_t*) {}
-	
-	friend class LashProject;
-	virtual void project_closed(const std::string& /*name*/) {}
-	
-	lash_client_t* _lash_client;
-};
-
-
-} // namespace Raul
-
-#endif // RAUL_LASH_CLIENT_HPP
-
diff --git a/raul/LashProject.hpp b/raul/LashProject.hpp
deleted file mode 100644
index ae641a5..0000000
--- a/raul/LashProject.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This file is part of Raul.
- * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
- * 
- * Raul 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.
- * 
- * Raul 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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RAUL_LASH_PROJECT_HPP
-#define RAUL_LASH_PROJECT_HPP
-
-#include <string>
-#include <sigc++/sigc++.h>
-#include <raul/SharedPtr.hpp>
-#include <raul/WeakPtr.hpp>
-#include <raul/LashClient.hpp>
-
-namespace Raul {
-
-
-class LashProject : public sigc::trackable {
-public:
-	LashProject(SharedPtr<LashClient> client, const std::string& name);
-
-	void save();
-	void close();
-
-	const std::string& name()      { return _name; }
-	const std::string& directory() { return _directory; }
-
-	void set_directory(const std::string& filename);
-	void set_name(const std::string& name);
-	
-	sigc::signal<void, const std::string&> signal_name;
-	sigc::signal<void, const std::string&> signal_directory;
-	sigc::signal<void, const std::string&> signal_save_file;
-	sigc::signal<void, const std::string&> signal_restore_file;
-
-	bool operator==(const std::string& name) { return _name == name; }
-
-private:
-	WeakPtr<LashClient> _client;
-	std::string         _name;
-	std::string         _directory;
-};
-
-
-} // namespace Raul
-
-#endif // RAUL_LASH_PROJECT_HPP
-
diff --git a/raul/LashServerInterface.hpp b/raul/LashServerInterface.hpp
deleted file mode 100644
index 339f6f7..0000000
--- a/raul/LashServerInterface.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/* This file is part of Raul.
- * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
- * 
- * Raul 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.
- * 
- * Raul 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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef RAUL_LASH_SERVER_INTERFACE_HPP
-#define RAUL_LASH_SERVER_INTERFACE_HPP
-
-#include <string>
-#include <list>
-#include <lash/lash.h>
-#include <raul/LashClient.hpp>
-#include <raul/LashProject.hpp>
-#include <raul/SharedPtr.hpp>
-#include <sigc++/sigc++.h>
-
-namespace Raul {
-
-
-class LashServerInterface : public LashClient, public sigc::trackable {
-public:
-	static SharedPtr<LashServerInterface> create(
-			lash_args_t*         args,
-	        const std::string&   name,
-	        int                  flags);
-
-	sigc::signal<void>                                signal_quit;
-	sigc::signal<void, const SharedPtr<LashProject> > signal_project_add;
-	sigc::signal<void, const SharedPtr<LashProject> > signal_project_remove;
-
-	void restore_project(const std::string& filename);
-
-	typedef std::list<SharedPtr<LashProject> > Projects;
-	Projects& projects() { return _projects; }
-
-	SharedPtr<LashProject> project(const std::string& name);
-
-private:
-	LashServerInterface(lash_client_t* client);
-	void handle_event(lash_event_t* ev);
-	void project_closed(const std::string& name);
-
-	Projects _projects;
-};
-
-
-} // namespace Raul
-
-#endif // RAUL_LASH_SERVER_INTERFACE_HPP
-
diff --git a/raul/Makefile.am b/raul/Makefile.am
index fd23b9e..45adad8 100644
--- a/raul/Makefile.am
+++ b/raul/Makefile.am
@@ -40,6 +40,3 @@ raulinclude_HEADERS = \
 	midi_events.h \
 	midi_names.h
 
-if WITH_LASH
-raulinclude_HEADERS += LashClient.hpp LashServerInterface.hpp LashProject.hpp
-endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 3b4484e..6f3d527 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-libraul_la_CXXFLAGS = @RAUL_CFLAGS@ @GLIBMM_CFLAGS@ @GTHREAD_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@
-libraul_la_LIBADD = @GLIBMM_LIBS@ @GTHREAD_LIBS@ @JACK_LIBS@ @LASH_LIBS@
+libraul_la_CXXFLAGS = @RAUL_CFLAGS@ @GLIBMM_CFLAGS@ @GTHREAD_CFLAGS@ @JACK_CFLAGS@
+libraul_la_LIBADD = @GLIBMM_LIBS@ @GTHREAD_LIBS@ @JACK_LIBS@
 libraul_la_LDFLAGS = -version-info @RAUL_SO_VERSION@
 
 lib_LTLIBRARIES = libraul.la
@@ -16,6 +16,3 @@ if WITH_JACK
 libraul_la_SOURCES += JackDriver.cpp
 endif
 
-if WITH_LASH
-libraul_la_SOURCES += LashClient.cpp LashServerInterface.cpp LashProject.cpp
-endif