diff options
| author | David Robillard <d@drobilla.net> | 2007-01-11 19:50:49 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-01-11 19:50:49 +0000 |
| commit | f7563c2b158252339f98e38719cfc3e092ef7ac7 (patch) | |
| tree | b90084b8cc82e613a9dfc73202fdffcf0a05481d /gtk2_ardour/ardour_ui.cc | |
| parent | 532f6aad4ac79ca15d69deccd18fca90e444c437 (diff) | |
Merged with trunk R1304
git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b85278b8b5..07d322a1fb 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -39,6 +39,7 @@ #include <pbd/pathscanner.h> #include <pbd/failed_constructor.h> #include <pbd/enumwriter.h> +#include <pbd/stacktrace.h> #include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/utils.h> #include <gtkmm2ext/click_box.h> @@ -113,7 +114,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) /* big clock */ - big_clock (X_("bigclock"), false, "BigClockNonRecording", true, false, true), + big_clock (X_("bigclock"), false, "BigClockNonRecording", false, false, true), /* transport */ @@ -252,9 +253,10 @@ ARDOUR_UI::set_engine (AudioEngine& e) throw failed_constructor(); } - /* listen to clock mode changes */ + /* set default clock modes */ - AudioClock::ModeChanged.connect (mem_fun (*this, &ARDOUR_UI::store_clock_modes)); + primary_clock.set_mode (AudioClock::SMPTE); + secondary_clock.set_mode (AudioClock::BBT); /* start the time-of-day-clock */ @@ -1834,6 +1836,7 @@ ARDOUR_UI::load_session (const string & path, const string & snap_name, string* Session *new_session; int x; session_loaded = false; + x = unload_session (); if (x < 0) { @@ -2447,6 +2450,8 @@ ARDOUR_UI::update_transport_clocks (nframes_t pos) void ARDOUR_UI::record_state_changed () { + ENSURE_GUI_THREAD (mem_fun (*this, &ARDOUR_UI::record_state_changed)); + if (!session || !big_clock_window) { /* why bother - the clock isn't visible */ return; @@ -2454,10 +2459,10 @@ ARDOUR_UI::record_state_changed () switch (session->record_status()) { case Session::Recording: - big_clock.set_name ("BigClockRecording"); + big_clock.set_widget_name ("BigClockRecording"); break; default: - big_clock.set_name ("BigClockNonRecording"); + big_clock.set_widget_name ("BigClockNonRecording"); break; } } |