smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-26 00:17:49 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Record restriction: track selection sensitive actions were activated without track selection after record finish, which is wrong.

Browse source 
Disabled "Quit" during active record.
This commit is contained in:
GZharun 2015-01-30 12:20:06 +02:00
parent 3d2877c125
commit 00115c072f
4 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
gtk2_ardour/ardour_ui.cc
View file

@ -965,6 +965,13 @@ ARDOUR_UI::check_memory_locking ()
void
ARDOUR_UI::queue_finish ()
{
if (_session) {
// do not queue finish if we are actively recording
if (_session->actively_recording () && _session->have_rec_enabled_track () ) {
return;
}
}
Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::idle_finish));
}
@ -979,6 +986,11 @@ void
ARDOUR_UI::finish()
{
if (_session) {
if (_session->actively_recording () && _session->have_rec_enabled_track () ) {
return;
}
ARDOUR_UI::instance()->video_timeline->sync_session_state();
if (_session->dirty()) {
@ -1967,7 +1979,7 @@ void ARDOUR_UI::toggle_multi_out_mode ()
return;
}
if (_session->record_status () == Session::Recording && _session->have_rec_enabled_track ()) {
if (_session->actively_recording() && _session->have_rec_enabled_track ()) {
return;
}
@ -1988,7 +2000,7 @@ void ARDOUR_UI::toggle_stereo_out_mode ()
return;
}
if (_session->record_status () == Session::Recording && _session->have_rec_enabled_track ()) {
if (_session->actively_recording () && _session->have_rec_enabled_track ()) {
return;
}
@ -2257,7 +2269,7 @@ ARDOUR_UI::screen_lock_is_allowed() const
if(!_session)
return false;
if( (_session->record_status() == Session::Recording) && (ARDOUR_UI::config()->get_auto_lock_timer () != 0) )
if( (_session->actively_recording() ) && (ARDOUR_UI::config()->get_auto_lock_timer () != 0) )
return true;
else
return false;
@ -2269,7 +2281,7 @@ ARDOUR_UI::session_auto_save_is_allowed() const
if(!_session)
return false;
if( (_session->record_status() == Session::Recording) && (ARDOUR_UI::config()->get_auto_save_timer () != 0) )
if( (_session->actively_recording () ) && (ARDOUR_UI::config()->get_auto_save_timer () != 0) )
return true;
else
return false;
@ -4067,11 +4079,11 @@ ARDOUR_UI::xrun_handler (framepos_t where)
ENSURE_GUI_THREAD (*this, &ARDOUR_UI::xrun_handler, where)
if (_session && Config->get_create_xrun_marker() && _session->actively_recording()) {
if (_session && Config->get_create_xrun_marker() && _session->actively_recording() ) {
create_xrun_marker(where);
}
if (_session && Config->get_stop_recording_on_xrun() && _session->actively_recording()) {
if (_session && Config->get_stop_recording_on_xrun() && _session->actively_recording() ) {
halt_on_xrun_message ();
}
}
@ -4382,15 +4394,13 @@ ARDOUR_UI::record_state_changed ()
ENSURE_GUI_THREAD (*this, &ARDOUR_UI::record_state_changed);
if (!_session ) {
/* why bother - the clock isn't visible */
return;
}
if (_session->record_status () == Session::Recording && _session->have_rec_enabled_track ()) {
if (_session->actively_recording () && _session->have_rec_enabled_track ()) {
tracks_control_panel.action()->set_sensitive(false);
set_topbar_buttons_sensitive (false);
ActionManager::set_sensitive (ActionManager::record_restricted_actions, false);
if (big_clock_window) {
big_clock->set_active (true);
@ -4400,8 +4410,7 @@ ARDOUR_UI::record_state_changed ()
tracks_control_panel.action()->set_sensitive(true);
set_topbar_buttons_sensitive (true);
ActionManager::set_sensitive (ActionManager::record_restricted_actions, true);
if (big_clock_window) {
big_clock->set_active (false);
}

5
gtk2_ardour/ardour_ui_ed.cc
View file

@ -661,8 +661,11 @@ ARDOUR_UI::install_actions ()
/* these actions are intended to be shared across all windows */
common_actions = ActionGroup::create (X_("Common"));
act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track"),
sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
act = ActionManager::register_action (common_actions, X_("Quit"), _("Quit"), (hide_return (sigc::mem_fun(*this, &ARDOUR_UI::finish))));
ActionManager::record_restricted_actions.push_back (act);
/* windows visibility actions */

14
gtk2_ardour/editor.cc
View file

@ -1243,12 +1243,26 @@ Editor::on_record_state_changed ()
start_session_auto_save_event_timing ();
if (_session->actively_recording() && _session->have_rec_enabled_track () ) {
set_record_restricted_actions_sensitive (false);
set_track_header_dnd_active (false);
} else {
set_record_restricted_actions_sensitive (true);
set_track_header_dnd_active (true);
}
}
void
Editor::set_record_restricted_actions_sensitive (bool yn)
{
ActionManager::set_sensitive (ActionManager::record_restricted_actions, yn);
// update actions we might activated prematurely
if (yn) {
// check if we should enable track selectin sensitive actions
ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, track_selected() );
}
}
bool
Editor::session_auto_save_timeout_callback ()
{

2
gtk2_ardour/editor.h
View file

@ -2085,6 +2085,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void toggle_tracks_active ();
void set_track_header_dnd_active (bool yn);
void set_record_restricted_actions_sensitive (bool yn);
bool _have_idled;
int resize_idle_id;
static gboolean _idle_resize (gpointer);