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

[Summary] Code improvement

Browse source 
[Reviewed] GZharun
This commit is contained in:
nikolay 2014-09-15 12:51:47 +03:00
parent f48f540aa6
commit 4f3f1d79ba
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/mixer_strip.cc
View file

@ -261,6 +261,8 @@ MixerStrip::init ()
_session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context()); _session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context());
_session->RecordStateChanged.connect (*this, invalidator (*this), boost::bind (&MixerStrip::on_record_state_changed, this), gui_context()); _session->RecordStateChanged.connect (*this, invalidator (*this), boost::bind (&MixerStrip::on_record_state_changed, this), gui_context());
_session->session_routes_reconnected.connect(_input_output_channels_update, invalidator (*this), boost::bind (&MixerStrip::update_inspector_info_panel, this), gui_context());
/* ditto for this button and busses */ /* ditto for this button and busses */
name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false); name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
@ -318,11 +320,7 @@ MixerStrip::init ()
/* note that this handler connects *before* the default handler */ /* note that this handler connects *before* the default handler */
_name_button_home.signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::controls_ebox_button_press)); _name_button_home.signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::controls_ebox_button_press));
_name_button_home.signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::controls_ebox_button_release)); _name_button_home.signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::controls_ebox_button_release));
_name_entry.set_max_length(13); _name_entry.set_max_length(13);
Session* session = ARDOUR_UI::instance()->the_session();
if( session )
session->session_routes_reconnected.connect(_input_output_channels_update, invalidator (*this), boost::bind (&MixerStrip::update_inspector_info_panel, this), gui_context());
} }
MixerStrip::~MixerStrip () MixerStrip::~MixerStrip ()
@ -423,7 +421,7 @@ MixerStrip::begin_name_edit ()
if( _route->is_master () ) if( _route->is_master () )
return; return;
if ( (ARDOUR_UI::instance()->the_session()->record_status()==Session::Recording) && (_route->record_enabled()) ) if ( (_session->record_status()==Session::Recording) && (_route->record_enabled()) )
return; return;
boost::shared_ptr<AudioTrack> audio_track = boost::dynamic_pointer_cast<AudioTrack>(_route); boost::shared_ptr<AudioTrack> audio_track = boost::dynamic_pointer_cast<AudioTrack>(_route);
@ -450,10 +448,10 @@ MixerStrip::route_rec_enable_changed ()
void void
MixerStrip::on_record_state_changed () MixerStrip::on_record_state_changed ()
{ {
if ( !ARDOUR_UI::instance()->the_session() ) if ( !_session )
return; return;
if ( (ARDOUR_UI::instance()->the_session()->record_status()==Session::Recording) && (_route->record_enabled()) ) if ( (_session->record_status()==Session::Recording) && (_route->record_enabled()) )
end_name_edit (RESPONSE_CANCEL); end_name_edit (RESPONSE_CANCEL);
} }
@ -1948,7 +1946,7 @@ MixerStrip::deselect_all_processors ()
bool bool
MixerStrip::delete_processors () MixerStrip::delete_processors ()
{ {
processor_box.processor_operation (ProcessorBox::ProcessorsDelete); return processor_box.processor_operation (ProcessorBox::ProcessorsDelete);
} }
void void

10
gtk2_ardour/route_time_axis.cc
View file

@ -2285,15 +2285,13 @@ RouteTimeAxisView::can_edit_name () const
if( audio_track && audio_track->is_master_track() ) if( audio_track && audio_track->is_master_track() )
return false; return false;
Session *session = ARDOUR_UI::instance()->the_session(); if (_session == 0) {
if (session == 0) {
return false; return false;
} }
/* we do not allow track name changes if it is record enabled /* we do not allow track name changes if it is record enabled
*/ */
return !( (session->record_status() == Session::Recording) && (_route->record_enabled()) ); return !( (_session->record_status() == Session::Recording) && (_route->record_enabled()) );
} }
void void
@ -2711,9 +2709,9 @@ RouteTimeAxisView::route_rec_enable_changed()
void void
RouteTimeAxisView::on_record_state_changed () RouteTimeAxisView::on_record_state_changed ()
{ {
if ( !ARDOUR_UI::instance()->the_session() ) if ( !_session )
return; return;
if ( (ARDOUR_UI::instance()->the_session()->record_status()==Session::Recording) && (_route->record_enabled()) ) if ( (_session->record_status()==Session::Recording) && (_route->record_enabled()) )
end_name_edit (RESPONSE_CANCEL); end_name_edit (RESPONSE_CANCEL);
} }