From 541839485feb6473d1c3688e5c5639dbc4149ba8 Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Mon, 17 Aug 2009 03:58:37 +0300 Subject: [PATCH] Disable compilation of currently unused code --- gui/Patchage.cpp | 40 +++++++++++++++++----------------------- gui/Patchage.hpp | 19 ++++++++++--------- wscript | 16 ++++++++-------- 3 files changed, 35 insertions(+), 40 deletions(-) diff --git a/gui/Patchage.cpp b/gui/Patchage.cpp index 6fe25cc4..5fd8e30b 100644 --- a/gui/Patchage.cpp +++ b/gui/Patchage.cpp @@ -160,15 +160,11 @@ Patchage::Patchage(int argc, char** argv) sigc::mem_fun(this, &Patchage::clear_load)); _zoom_normal_but->signal_clicked().connect(sigc::bind( sigc::mem_fun(this, &Patchage::zoom), 1.0)); -// _zoom_full_but->signal_clicked().connect( -// sigc::mem_fun(_canvas.get(), &PatchageCanvas::zoom_full)); +// _zoom_full_but->signal_clicked().connect(sigc::mem_fun(_canvas.get(), &PatchageCanvas::zoom_full)); - _menu_load_project->signal_activate().connect( - sigc::mem_fun(this, &Patchage::load_project_ask)); - _menu_save_all_projects->signal_activate().connect( - sigc::mem_fun(this, &Patchage::save_all_projects)); - _menu_close_all_projects->signal_activate().connect( - sigc::mem_fun(this, &Patchage::close_all_projects)); +// _menu_load_project->signal_activate().connect(sigc::mem_fun(this, &Patchage::load_project_ask)); +// _menu_save_all_projects->signal_activate().connect(sigc::mem_fun(this, &Patchage::save_all_projects)); +// _menu_close_all_projects->signal_activate().connect(sigc::mem_fun(this, &Patchage::close_all_projects)); _menu_file_quit->signal_activate().connect( sigc::mem_fun(this, &Patchage::on_quit)); @@ -188,24 +184,22 @@ Patchage::Patchage(int argc, char** argv) _about_win->set_transient_for(*_main_win); - _a2j = new a2j_proxy; +// _a2j = new a2j_proxy; //info_msg(str(boost::format("a2j jack client name is '%s'") % _a2j->get_jack_client_name())); - _session = new session(); +// _session = new session(); - _project_list = new project_list(this, _session); - _project_list_viewport->hide(); +// _project_list = new project_list(this, _session); +// _project_list_viewport->hide(); - _lash = new lash_proxy(_session); +// _lash = new lash_proxy(_session); //_menu_jack_start->signal_activate().connect(sigc::mem_fun(_jack, &jack_proxy::start_server)); //_menu_jack_stop->signal_activate().connect(sigc::mem_fun(_jack, &jack_proxy::stop_server)); - _menu_a2j_start->signal_activate().connect( - sigc::mem_fun(_a2j, &a2j_proxy::start_bridge)); - _menu_a2j_stop->signal_activate().connect( - sigc::mem_fun(_a2j, &a2j_proxy::stop_bridge)); +// _menu_a2j_start->signal_activate().connect(sigc::mem_fun(_a2j, &a2j_proxy::start_bridge)); +// _menu_a2j_stop->signal_activate().connect(sigc::mem_fun(_a2j, &a2j_proxy::stop_bridge)); //jack_status_changed(_jack->is_started()); @@ -221,10 +215,10 @@ Patchage::Patchage(int argc, char** argv) Patchage::~Patchage() { - delete _lash; - delete _project_list; - delete _session; - delete _a2j; + //delete _lash; + //delete _project_list; + //delete _session; + //delete _a2j; _about_win.destroy(); //_main_win.destroy(); @@ -475,10 +469,11 @@ Patchage::set_studio_availability( { _main_win->set_title("LADI Session Handler"); } - _project_list->set_lash_availability(available); + //_project_list->set_lash_availability(available); _menu_view_projects->set_active(available); } +#if 0 void Patchage::set_a2j_status( unsigned int status) @@ -555,7 +550,6 @@ Patchage::close_all_projects() _lash->close_all_projects(); } -#if 0 void Patchage::on_port_added( const char * jack_client_name, diff --git a/gui/Patchage.hpp b/gui/Patchage.hpp index 0b7df522..3b7fad7c 100644 --- a/gui/Patchage.hpp +++ b/gui/Patchage.hpp @@ -32,11 +32,10 @@ #include "Widget.hpp" #include -class PatchageCanvas; -class a2j_proxy; -class lash_proxy; -class project_list; -class session; +//class a2j_proxy; +//class lash_proxy; +//class project_list; +//class session; class Patchage { public: @@ -56,6 +55,7 @@ public: void update_state(); void set_studio_availability(bool available); +#if 0 void set_a2j_status(unsigned int status); void load_project_ask(); @@ -64,6 +64,7 @@ public: void save_project(const std::string& project_name); void close_project(const std::string& project_name); void close_all_projects(); +#endif protected: void connect_widgets(); @@ -97,10 +98,10 @@ protected: const char * jack_port_name); #endif - a2j_proxy * _a2j; - session * _session; - lash_proxy * _lash; - project_list * _project_list; + //a2j_proxy * _a2j; + //session * _session; + //lash_proxy * _lash; + //project_list * _project_list; Gtk::Main* _gtk_main; diff --git a/wscript b/wscript index e1b251fe..e9c26aef 100644 --- a/wscript +++ b/wscript @@ -269,14 +269,14 @@ def build(bld): 'Patchage.cpp', #'PatchageCanvas.cpp', #'StateManager.cpp', - 'lash_client.cpp', - 'lash_proxy.cpp', - 'load_projects_dialog.cpp', - 'project.cpp', - 'project_list.cpp', - 'project_properties.cpp', - 'session.cpp', - 'a2j_proxy.cpp', + #'lash_client.cpp', + #'lash_proxy.cpp', + #'load_projects_dialog.cpp', + #'project.cpp', + #'project_list.cpp', + #'project_properties.cpp', + #'session.cpp', + #'a2j_proxy.cpp', 'dbus_helpers.c', 'canvas.cpp', 'graph_canvas.c', -- 2.11.4.GIT