diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-25 15:32:24 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-25 15:32:24 +0000 |
commit | 9b258045167a2e9a645d9451b435bd5dafe4b2ad (patch) | |
tree | ab08b7b7d3ea3a71c75f36c8240c1e4524a48bb6 /libs/ardour/session.cc | |
parent | 39e6afb58230610e4b2df60668ff226ebd9374b1 (diff) |
add new Session::Dialog signal for generic dialog interactions with unknown GUI; made auto-analyse-audio FALSE by default, with dialog warning about this when necessary; fixed #2134 (loop/punch stuff not updated on undo/redo)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3182 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session.cc')
-rw-r--r-- | libs/ardour/session.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index d7c3c95d9d..56291e941e 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -105,6 +105,7 @@ Session::apply_gain_to_buffer_t Session::apply_gain_to_buffer = 0; Session::mix_buffers_with_gain_t Session::mix_buffers_with_gain = 0; Session::mix_buffers_no_gain_t Session::mix_buffers_no_gain = 0; +sigc::signal<void,std::string> Session::Dialog; sigc::signal<int> Session::AskAboutPendingState; sigc::signal<int,nframes_t,nframes_t> Session::AskAboutSampleRateMismatch; sigc::signal<void> Session::SendFeedback; @@ -1125,7 +1126,6 @@ Session::auto_loop_changed (Location* location) } last_loopend = location->end(); - } void @@ -1163,6 +1163,10 @@ Session::set_auto_punch_location (Location* location) auto_punch_changed_connection = location->changed.connect (mem_fun (this, &Session::auto_punch_changed)); location->set_auto_punch (true, this); + + + auto_punch_changed (location); + auto_punch_location_changed (location); } @@ -1202,6 +1206,13 @@ Session::set_auto_loop_location (Location* location) auto_loop_changed_connection = location->changed.connect (mem_fun (this, &Session::auto_loop_changed)); location->set_auto_loop (true, this); + + /* take care of our stuff first */ + + auto_loop_changed (location); + + /* now tell everyone else */ + auto_loop_location_changed (location); } @@ -2895,8 +2906,6 @@ Session::remove_source (boost::weak_ptr<Source> src) return; } - cerr << "remove source for " << source->name() << endl; - { Glib::Mutex::Lock lm (audio_source_lock); |