From df9adc430fe5f3d3d4c9c02a0dad1826da474799 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 1 Oct 2008 02:43:56 +0000 Subject: Integrate patchage into build system. git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1569 a436a847-0d15-0410-975c-d299462d15a1 --- src/Patchage.cpp | 40 +++++++++++++++++++++------------------- src/Patchage.hpp | 15 ++++++++++----- src/PatchageCanvas.cpp | 10 +++++----- src/PatchageEvent.cpp | 4 ++-- src/main.cpp | 4 ---- 5 files changed, 38 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 9a06819..d9723d6 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -28,7 +28,7 @@ #include "GladeFile.hpp" #if defined(HAVE_JACK_DBUS) #include "JackDbusDriver.hpp" -#elif defined(HAVE_JACK) +#elif defined(USE_LIBJACK) #include "JackDriver.hpp" #include #endif @@ -39,8 +39,10 @@ #ifdef HAVE_ALSA #include "AlsaDriver.hpp" #endif -#ifdef HAVE_DBUS +#if defined(HAVE_LASH) || defined(HAVE_JACK_DBUS) #include "DBus.hpp" +#endif +#ifdef HAVE_LASH #include "LashProxy.hpp" #include "LoadProjectDialog.hpp" #include "ProjectList.hpp" @@ -86,7 +88,7 @@ gtkmm_set_width_for_given_text (Gtk::Widget &w, const gchar *text, Patchage::Patchage(int argc, char** argv) : _xml(GladeFile::open("patchage")) -#ifdef HAVE_DBUS +#ifdef HAVE_LASH , _lash_proxy(NULL) , _dbus(NULL) , _project_list(NULL) @@ -175,7 +177,7 @@ Patchage::Patchage(int argc, char** argv) _zoom_full_but->signal_clicked().connect( sigc::mem_fun(_canvas.get(), &PatchageCanvas::zoom_full)); -#ifdef HAVE_DBUS +#ifdef HAVE_LASH _menu_open_session->signal_activate().connect( sigc::mem_fun(this, &Patchage::show_load_project_dialog)); _menu_view_projects->set_active(true); @@ -234,7 +236,7 @@ Patchage::Patchage(int argc, char** argv) _about_win->set_transient_for(*_main_win); -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) _jack_driver = new JackDriver(this); _jack_driver->signal_detached.connect(sigc::mem_fun(this, &Patchage::queue_refresh)); @@ -248,7 +250,7 @@ Patchage::Patchage(int argc, char** argv) _alsa_driver = new AlsaDriver(this); #endif -#ifdef HAVE_DBUS +#ifdef HAVE_LASH _dbus = new DBus(this); _session = new Session(); _project_list = new ProjectList(this, _session); @@ -270,13 +272,13 @@ Patchage::Patchage(int argc, char** argv) Patchage::~Patchage() { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) delete _jack_driver; #endif #ifdef HAVE_ALSA delete _alsa_driver; #endif -#ifdef HAVE_DBUS +#ifdef HAVE_LASH delete _lash_proxy; #endif delete _state_manager; @@ -292,7 +294,7 @@ Patchage::attach() { _enable_refresh = false; -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) _jack_driver->attach(true); #endif @@ -321,7 +323,7 @@ Patchage::idle_callback() } // Process any JACK events -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) if (_jack_driver) { _jack_driver->process_events(this); } @@ -349,7 +351,7 @@ Patchage::idle_callback() void Patchage::update_toolbar() { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) if (_enable_refresh && _jack_driver->is_attached()) _buffer_size_combo->set_active((int)log2f(_jack_driver->buffer_size()) - 5); #endif @@ -359,7 +361,7 @@ Patchage::update_toolbar() bool Patchage::update_load() { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) if (!_jack_driver->is_attached()) return true; @@ -399,7 +401,7 @@ Patchage::refresh() _canvas->destroy(); -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) if (_jack_driver) _jack_driver->refresh(); #endif @@ -438,7 +440,7 @@ Patchage::store_window_location() void Patchage::clear_load() { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) _main_xrun_progress->set_fraction(0.0); _jack_driver->reset_xruns(); _jack_driver->reset_max_dsp_load(); @@ -499,7 +501,7 @@ Patchage::update_state() void Patchage::connect_widgets() { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) _jack_driver->signal_attached.connect( sigc::mem_fun(this, &Patchage::update_toolbar)); _jack_driver->signal_attached.connect(sigc::bind( @@ -528,7 +530,7 @@ Patchage::connect_widgets() #endif } -#ifdef HAVE_DBUS +#ifdef HAVE_LASH void Patchage::show_load_project_dialog() { @@ -540,7 +542,7 @@ Patchage::show_load_project_dialog() } #endif -#ifdef HAVE_DBUS +#ifdef HAVE_LASH void Patchage::set_lash_available(bool available) { @@ -617,7 +619,7 @@ Patchage::on_quit() #ifdef HAVE_ALSA _alsa_driver->detach(); #endif -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) _jack_driver->detach(); #endif _main_win->hide(); @@ -673,7 +675,7 @@ Patchage::on_scroll(GdkEventScroll* ev) void Patchage::buffer_size_changed() { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) const int selected = _buffer_size_combo->get_active_row_number(); if (selected == -1) { diff --git a/src/Patchage.hpp b/src/Patchage.hpp index 05cff7b..b35e43f 100644 --- a/src/Patchage.hpp +++ b/src/Patchage.hpp @@ -49,9 +49,11 @@ public: #ifdef HAVE_ALSA AlsaDriver* alsa_driver() const { return _alsa_driver; } #endif -#ifdef HAVE_DBUS - LashProxy* lash_proxy() const { return _lash_proxy; } - DBus* dbus() const { return _dbus; } +#if defined(HAVE_LASH) || defined(HAVE_JACK_DBUS) + DBus* dbus() const { return _dbus; } +#endif +#ifdef HAVE_LASH + LashProxy* lash_proxy() const { return _lash_proxy; } void show_load_project_dialog(); void set_lash_available(bool available); @@ -97,9 +99,12 @@ protected: Glib::RefPtr _xml; -#ifdef HAVE_DBUS +#if defined(HAVE_LASH) || defined(HAVE_JACK_DBUS) + DBus* _dbus; +#endif + +#ifdef HAVE_LASH LashProxy* _lash_proxy; - DBus* _dbus; ProjectList* _project_list; Session* _session; #endif diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index 6b610e4..2735a61 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -21,7 +21,7 @@ #include "Patchage.hpp" #if defined(HAVE_JACK_DBUS) #include "JackDbusDriver.hpp" -#elif defined(HAVE_JACK) +#elif defined(USE_LIBJACK) #include "JackDriver.hpp" #endif #include "PatchageModule.hpp" @@ -70,7 +70,7 @@ PatchageCanvas::find_port(const PortID& id) string module_name; string port_name; -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) jack_port_t* jack_port = NULL; #endif @@ -79,7 +79,7 @@ PatchageCanvas::find_port(const PortID& id) // TODO: filthy. keep a port map and make this O(log(n)) switch (id.type) { -#if defined(HAVE_JACK) && !defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) && !defined(HAVE_JACK_DBUS) case PortID::JACK_ID: jack_port = jack_port_by_id(_app->jack_driver()->client(), id.id.jack_id); if (!jack_port) @@ -145,7 +145,7 @@ PatchageCanvas::connect(boost::shared_ptr port1, boost::shared_ptr< if ((p1->type() == JACK_AUDIO && p2->type() == JACK_AUDIO) || ((p1->type() == JACK_MIDI && p2->type() == JACK_MIDI))) { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) _app->jack_driver()->connect(p1, p2); #endif #ifdef HAVE_ALSA @@ -183,7 +183,7 @@ PatchageCanvas::disconnect(boost::shared_ptr port1, boost::shared_p if ((input->type() == JACK_AUDIO && output->type() == JACK_AUDIO) || (input->type() == JACK_MIDI && output->type() == JACK_MIDI)) { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) _app->jack_driver()->disconnect(output, input); #endif #ifdef HAVE_ALSA diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp index 06e85d5..cc58350 100644 --- a/src/PatchageEvent.cpp +++ b/src/PatchageEvent.cpp @@ -24,7 +24,7 @@ #include "Driver.hpp" #if defined(HAVE_JACK_DBUS) #include "JackDbusDriver.hpp" -#elif defined(HAVE_JACK) +#elif defined(USE_LIBJACK) #include "JackDriver.hpp" #endif #ifdef HAVE_ALSA @@ -59,7 +59,7 @@ PatchageEvent::execute(Patchage* patchage) Driver* driver = NULL; if (_port_1.type == PortID::JACK_ID) { -#if defined(HAVE_JACK) || defined(HAVE_JACK_DBUS) +#if defined(USE_LIBJACK) || defined(HAVE_JACK_DBUS) driver = patchage->jack_driver(); #endif #ifdef HAVE_ALSA diff --git a/src/main.cpp b/src/main.cpp index 0e61d9d..3c20237 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,10 +23,6 @@ #include "Patchage.hpp" -#ifdef HAVE_LASH -#include -#endif // HAVE_LASH - int main(int argc, char** argv) { try { -- cgit v1.2.1