diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/AlsaDriver.cpp | 2 | ||||
-rw-r--r-- | src/JackDbusDriver.cpp | 3 | ||||
-rw-r--r-- | src/JackDriver.cpp | 15 | ||||
-rw-r--r-- | src/JackDriver.hpp | 7 | ||||
-rw-r--r-- | src/Patchage.cpp | 1 | ||||
-rw-r--r-- | src/PatchageCanvas.cpp | 2 | ||||
-rw-r--r-- | src/PatchageEvent.cpp | 2 | ||||
-rw-r--r-- | src/StateManager.cpp | 4 | ||||
-rw-r--r-- | src/UIFile.hpp | 7 | ||||
-rw-r--r-- | src/main.cpp | 6 |
10 files changed, 9 insertions, 40 deletions
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp index 8ec2d36..9aeb040 100644 --- a/src/AlsaDriver.cpp +++ b/src/AlsaDriver.cpp @@ -21,8 +21,6 @@ #include <boost/format.hpp> -#include "raul/SharedPtr.hpp" - #include "AlsaDriver.hpp" #include "Patchage.hpp" #include "PatchageCanvas.hpp" diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp index 672957e..6121934 100644 --- a/src/JackDbusDriver.cpp +++ b/src/JackDbusDriver.cpp @@ -28,9 +28,6 @@ #include <boost/format.hpp> -#include "raul/log.hpp" -#include "raul/SharedPtr.hpp" - #include "Driver.hpp" #include "JackDbusDriver.hpp" #include "Patchage.hpp" diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp index 8b3f56d..cadadb7 100644 --- a/src/JackDriver.cpp +++ b/src/JackDriver.cpp @@ -24,15 +24,13 @@ #include <jack/jack.h> #include <jack/statistics.h> -#include "raul/SharedPtr.hpp" -#include "raul/log.hpp" - -#include "patchage-config.h" #include "JackDriver.hpp" #include "Patchage.hpp" #include "PatchageCanvas.hpp" #include "PatchageEvent.hpp" #include "PatchageModule.hpp" +#include "Queue.hpp" +#include "patchage-config.h" using std::endl; using std::string; @@ -64,8 +62,6 @@ JackDriver::attach(bool launch_daemon) if (_client) return; - jack_set_error_function(error_cb); - jack_options_t options = (!launch_daemon) ? JackNoStartServer : JackNullOption; _client = jack_client_open("Patchage", options, NULL); if (_client == NULL) { @@ -74,7 +70,6 @@ JackDriver::attach(bool launch_daemon) } else { jack_client_t* const client = _client; - jack_set_error_function(error_cb); jack_on_shutdown(client, jack_shutdown_cb, this); jack_set_client_registration_callback(client, jack_client_registration_cb, this); jack_set_port_registration_callback(client, jack_port_registration_cb, this); @@ -464,12 +459,6 @@ JackDriver::jack_shutdown_cb(void* jack_driver) me->signal_detached.emit(); } -void -JackDriver::error_cb(const char* msg) -{ - Raul::error << "jack error: " << msg << endl; -} - jack_nframes_t JackDriver::buffer_size() { diff --git a/src/JackDriver.hpp b/src/JackDriver.hpp index 4622ad1..df1a33f 100644 --- a/src/JackDriver.hpp +++ b/src/JackDriver.hpp @@ -23,9 +23,8 @@ #include <glibmm/thread.h> -#include "raul/SRSWQueue.hpp" - #include "Driver.hpp" +#include "Queue.hpp" class Patchage; class PatchageEvent; @@ -84,8 +83,6 @@ private: jack_port_t* port, PortID id); - static void error_cb(const char* msg); - void shutdown(); static void jack_client_registration_cb(const char* name, int registered, void* me); @@ -97,7 +94,7 @@ private: Patchage* _app; jack_client_t* _client; - Raul::SRSWQueue<PatchageEvent> _events; + Queue<PatchageEvent> _events; Glib::Mutex _shutdown_mutex; diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 0b77244..a846a20 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -32,7 +32,6 @@ #include <gtkmm/treemodel.h> #include "flowcanvas/Module.hpp" -#include "raul/SharedPtr.hpp" #include "patchage-config.h" #include "UIFile.hpp" diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index 070ef8c..0eba567 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -16,8 +16,6 @@ #include <boost/format.hpp> -#include "raul/SharedPtr.hpp" - #include "patchage-config.h" #if defined(HAVE_JACK_DBUS) diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp index 818859c..7da0cbb 100644 --- a/src/PatchageEvent.cpp +++ b/src/PatchageEvent.cpp @@ -16,8 +16,6 @@ #include <boost/format.hpp> -#include "raul/SharedPtr.hpp" - #include "patchage-config.h" #include "Patchage.hpp" #include "PatchageCanvas.hpp" diff --git a/src/StateManager.cpp b/src/StateManager.cpp index 34264c3..2a84d97 100644 --- a/src/StateManager.cpp +++ b/src/StateManager.cpp @@ -19,8 +19,6 @@ #include <stdexcept> #include <fstream> -#include "raul/log.hpp" - #include "StateManager.hpp" #include "Patchage.hpp" @@ -130,7 +128,7 @@ StateManager::load(const string& filename) if ( ! is.good()) return; - Raul::info << "Loading configuration file " << filename << endl; + std::cout << "Loading configuration file " << filename << std::endl; string s; diff --git a/src/UIFile.hpp b/src/UIFile.hpp index 42f1f21..2abc3e5 100644 --- a/src/UIFile.hpp +++ b/src/UIFile.hpp @@ -19,13 +19,10 @@ #include <fstream> #include <sstream> -#include <stdexcept> #include <string> #include <gtkmm/builder.h> -#include "raul/log.hpp" - #include "patchage-config.h" #ifdef PATCHAGE_BINLOC #include "binary_location.h" @@ -51,14 +48,14 @@ public: ui_filename = bundle + "/" + base_name + ".ui"; free(loc); if (is_readable(ui_filename)) { - Raul::info << "Loading UI file " << ui_filename << std::endl; + std::cout << "Loading UI file " << ui_filename << std::endl; return Gtk::Builder::create_from_file(ui_filename); } } #endif ui_filename = std::string(PATCHAGE_DATA_DIR) + "/" + base_name + ".ui"; if (is_readable(ui_filename)) { - Raul::info << "Loading UI file " << ui_filename << std::endl; + std::cout << "Loading UI file " << ui_filename << std::endl; return Gtk::Builder::create_from_file(ui_filename); } diff --git a/src/main.cpp b/src/main.cpp index 5b954bd..1048523 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,8 +27,6 @@ #include <libgnomecanvasmm/init.h> #include <glibmm/exception.h> -#include "raul/log.hpp" - #include "Patchage.hpp" #ifdef __APPLE__ @@ -80,10 +78,10 @@ main(int argc, char** argv) app.run(*patchage.window()); } catch (std::exception& e) { - Raul::error << "patchage: error: " << e.what() << std::endl; + std::cerr << "patchage: error: " << e.what() << std::endl; return 1; } catch (Glib::Exception& e) { - Raul::error << "patchage: error: " << e.what() << std::endl; + std::cerr << "patchage: error: " << e.what() << std::endl; return 1; } |