diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 111 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 8 |
2 files changed, 0 insertions, 119 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 351e28ac99..ebfa51fdb7 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -651,59 +651,6 @@ ARDOUR_UI::update_autosave () } void -ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel) -{ - string title; - if (we_set_params) { - title = string_compose (_("%1 could not start JACK"), PROGRAM_NAME); - } else { - title = string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME); - } - - MessageDialog win (title, - false, - Gtk::MESSAGE_INFO, - Gtk::BUTTONS_NONE); - - if (we_set_params) { - win.set_secondary_text(_("There are several possible reasons:\n\ -\n\ -1) You requested audio parameters that are not supported..\n\ -2) JACK is running as another user.\n\ -\n\ -Please consider the possibilities, and perhaps try different parameters.")); - } else { - win.set_secondary_text(_("There are several possible reasons:\n\ -\n\ -1) JACK is not running.\n\ -2) JACK is running as another user, perhaps root.\n\ -3) There is already another client called \"ardour\".\n\ -\n\ -Please consider the possibilities, and perhaps (re)start JACK.")); - } - - if (toplevel) { - win.set_transient_for (*toplevel); - } - - if (we_set_params) { - win.add_button (Stock::OK, RESPONSE_CLOSE); - } else { - win.add_button (Stock::QUIT, RESPONSE_CLOSE); - } - - win.set_default_response (RESPONSE_CLOSE); - - win.show_all (); - win.set_position (Gtk::WIN_POS_CENTER); - pop_back_splash (win); - - /* we just don't care about the result, but we want to block */ - - win.run (); -} - -void ARDOUR_UI::startup () { Application* app = Application::instance (); @@ -1192,13 +1139,6 @@ ARDOUR_UI::update_wall_clock () return TRUE; } -gint -ARDOUR_UI::session_menu (GdkEventButton */*ev*/) -{ - session_popup_menu->popup (0, 0); - return TRUE; -} - void ARDOUR_UI::redisplay_recent_sessions () { @@ -1540,25 +1480,6 @@ restart JACK with more ports."), PROGRAM_NAME)); } void -ARDOUR_UI::do_transport_locate (framepos_t new_position, bool with_roll) -{ - framecnt_t _preroll = 0; - - if (_session) { - // XXX CONFIG_CHANGE FIX - requires AnyTime handling - // _preroll = _session->convert_to_frames_at (new_position, Config->get_preroll()); - - if (new_position > _preroll) { - new_position -= _preroll; - } else { - new_position = 0; - } - - _session->request_locate (new_position, with_roll); - } -} - -void ARDOUR_UI::transport_goto_start () { if (_session) { @@ -1651,14 +1572,6 @@ ARDOUR_UI::transport_stop () } void -ARDOUR_UI::transport_stop_and_forget_capture () -{ - if (_session) { - _session->request_stop (true, true); - } -} - -void ARDOUR_UI::remove_last_capture() { if (editor) { @@ -2098,12 +2011,6 @@ ARDOUR_UI::do_engine_start () } void -ARDOUR_UI::setup_theme () -{ - theme_manager->setup_theme(); -} - -void ARDOUR_UI::update_clocks () { if (!editor || !editor->dragging_playhead()) { @@ -2123,18 +2030,6 @@ ARDOUR_UI::stop_clocking () clock_signal_connection.disconnect (); } -void -ARDOUR_UI::toggle_clocking () -{ -#if 0 - if (clock_button.get_active()) { - start_clocking (); - } else { - stop_clocking (); - } -#endif -} - gint ARDOUR_UI::_blink (void *arg) @@ -2554,12 +2449,6 @@ ARDOUR_UI::idle_load (const std::string& path) } void -ARDOUR_UI::end_loading_messages () -{ - // hide_splash (); -} - -void ARDOUR_UI::loading_message (const std::string& msg) { if (ARDOUR_COMMAND_LINE::no_splash) { diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 3be101cdd6..2b687cd11e 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -188,7 +188,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void save_ardour_state (); gboolean configure_handler (GdkEventConfigure* conf); - void do_transport_locate (framepos_t, bool); void halt_on_xrun_message (); void xrun_handler (framepos_t); void create_xrun_marker (framepos_t); @@ -244,7 +243,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void restore_editing_space (); void setup_profile (); - void setup_theme (); void setup_tooltips (); void set_shuttle_fract (double); @@ -258,7 +256,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr protected: friend class PublicEditor; - void toggle_clocking (); void toggle_auto_play (); void toggle_auto_input (); void toggle_punch (); @@ -292,7 +289,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr static ARDOUR_UI *theArdourUI; - void backend_audio_error (bool we_set_params, Gtk::Window* toplevel = 0); void startup (); void shutdown (); @@ -521,8 +517,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr sigc::connection point_oh_five_second_connection; sigc::connection point_zero_one_second_connection; - gint session_menu (GdkEventButton *); - void open_session (); void open_recent_session (); void save_template (); @@ -542,7 +536,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void transport_goto_end (); void transport_goto_wallclock (); void transport_stop (); - void transport_stop_and_forget_capture (); void transport_record (bool roll); void transport_roll (); void transport_play_selection(); @@ -682,7 +675,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::ToggleButton error_log_button; void loading_message (const std::string& msg); - void end_loading_messages (); void toggle_translations (); |