diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2008-04-16 00:38:09 +0000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2008-04-16 00:38:09 +0000 |
commit | 656524c23e7ddf07d98c4b87a44a8a18d0f3c4a6 (patch) | |
tree | 29c135121eb46888e4745847279360324f3084b3 /gtk2_ardour | |
parent | da91ac66864edc77ed64ab6d2ecfc5b0f5778812 (diff) |
Remove some unused classes, methods and variables, mostly in ARDOUR_UI
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3254 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 75 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui.h | 19 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/route_ui.h | 4 |
4 files changed, 0 insertions, 100 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 62916e2f09..4e474661cc 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -105,10 +105,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, true), postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, true), - /* adjuster table */ - - adjuster_table (3, 3), - /* preroll stuff */ preroll_button (_("pre\nroll")), @@ -795,8 +791,6 @@ ARDOUR_UI::ask_about_saving_session (const string & what) window.set_resizable (false); window.show_all (); - save_the_session = 0; - window.set_keep_above (true); window.present (); @@ -1128,33 +1122,6 @@ ARDOUR_UI::open_recent_session () } bool -ARDOUR_UI::filter_ardour_session_dirs (const FileFilter::Info& info) -{ - struct stat statbuf; - - if (stat (info.filename.c_str(), &statbuf) != 0) { - return false; - } - - if (!S_ISDIR(statbuf.st_mode)) { - return false; - } - - // XXX Portability - - string session_file = info.filename; - session_file += '/'; - session_file += Glib::path_get_basename (info.filename); - session_file += ".ardour"; - - if (stat (session_file.c_str(), &statbuf) != 0) { - return false; - } - - return S_ISREG (statbuf.st_mode); -} - -bool ARDOUR_UI::check_audioengine () { if (engine) { @@ -1863,17 +1830,6 @@ ARDOUR_UI::save_state_canfail (string name) } void -ARDOUR_UI::restore_state (string name) -{ - if (session) { - if (name.length() == 0) { - name = session->name(); - } - session->restore_state (name); - } -} - -void ARDOUR_UI::primary_clock_value_changed () { if (session) { @@ -1898,37 +1854,6 @@ ARDOUR_UI::secondary_clock_value_changed () } void -ARDOUR_UI::rec_enable_button_blink (bool onoff, AudioDiskstream *dstream, Widget *w) -{ - if (session && dstream && dstream->record_enabled()) { - - Session::RecordState rs; - - rs = session->record_status (); - - switch (rs) { - case Session::Disabled: - case Session::Enabled: - if (w->get_state() != STATE_SELECTED) { - w->set_state (STATE_SELECTED); - } - break; - - case Session::Recording: - if (w->get_state() != STATE_ACTIVE) { - w->set_state (STATE_ACTIVE); - } - break; - } - - } else { - if (w->get_state() != STATE_NORMAL) { - w->set_state (STATE_NORMAL); - } - } -} - -void ARDOUR_UI::transport_rec_enable_blink (bool onoff) { if (session == 0) { diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 605cb97700..e71740134a 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -148,7 +148,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI int save_state_canfail (string state_name = ""); void save_state (const string & state_name = ""); - void restore_state (string state_name = ""); static double gain_to_slider_position (ARDOUR::gain_t g); static ARDOUR::gain_t slider_position_to_gain (double pos); @@ -176,12 +175,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI static sigc::signal<void> SuperRapidScreenUpdate; static sigc::signal<void,nframes_t, bool, nframes_t> Clock; - /* this is a helper function to centralize the (complex) logic for - blinking rec-enable buttons. - */ - - void rec_enable_button_blink (bool onoff, ARDOUR::AudioDiskstream *, Gtk::Widget *w); - void name_io_setup (ARDOUR::AudioEngine&, string&, ARDOUR::IO& io, bool in); static gint hide_and_quit (GdkEventAny *ev, ArdourDialog *); @@ -284,10 +277,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI void goto_editor_window (); void goto_mixer_window (); - - Gtk::Table adjuster_table; - Gtk::Frame adjuster_frame; - Gtk::Fixed adjuster_base; GlobalClickBox *online_control_button; vector<string> online_control_strings; @@ -298,9 +287,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI Gtk::ToggleButton preroll_button; Gtk::ToggleButton postroll_button; - Gtk::Table transport_table; - Gtk::Table option_table; - int setup_windows (); void setup_transport (); void setup_clock (); @@ -313,7 +299,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI void finish(); int ask_about_saving_session (const string & why); - int save_the_session; /* periodic safety backup, to be precise */ gint autosave_session(); @@ -351,7 +336,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI void manage_window (Gtk::Window&); AudioClock big_clock; - Gtk::Frame big_clock_frame; Gtk::Window* big_clock_window; void update_transport_clocks (nframes_t pos); @@ -682,9 +666,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI Gtk::MenuItem* jack_reconnect_item; Gtk::Menu* jack_bufsize_menu; - int make_session_clean (); - bool filter_ardour_session_dirs (const Gtk::FileFilter::Info&); - Glib::RefPtr<Gtk::ActionGroup> common_actions; void editor_realized (); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 3b4ba9e5ff..ae3b7decdb 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -732,8 +732,6 @@ class Editor : public PublicEditor vector<nframes_t> region_boundary_cache; void build_region_boundary_cache (); - Gtk::VBox trackview_vpacker; - Gtk::HBox top_hbox; Gtk::HBox bottom_hbox; diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 1a6a6ecc73..f22b0f2967 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -119,10 +119,6 @@ class RouteUI : public virtual AxisView int set_color_from_route (); - sigc::connection blink_connection; - - void rec_enable_button_blink (bool onoff, ARDOUR::AudioDiskstream *, Gtk::Widget *w); - void remove_this_route (); static gint idle_remove_this_route (RouteUI *); |