[Summary] refactoring of the function session_parameter_changed()

[Review] GZharun
This commit is contained in:
nikolay 2014-07-09 13:55:59 +03:00
parent 0ab2939935
commit b55052c824
4 changed files with 7 additions and 18 deletions

View file

@ -3143,7 +3143,6 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
session_loaded = true;
tracks_control_panel->refresh_session_settings_info();
_session->config.ParameterChanged.connect_same_thread (connection_with_session_config, boost::bind (&ARDOUR_UI::on_parameter_changed, this, _1));
goto_editor_window ();
@ -3220,15 +3219,6 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
return 0;
}
void
ARDOUR_UI::on_parameter_changed(std::string param)
{
if (param == "native-file-data-format" || param == "native-file-header-format")
update_format();
if ( param == "timecode-format")
update_timecode_format();
}
void
ARDOUR_UI::launch_chat ()
{

View file

@ -725,7 +725,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void toggle_use_osc ();
void parameter_changed (std::string);
void session_parameter_changed (std::string);
void session_parameter_changed (const std::string& param);
bool first_idle ();
@ -788,7 +788,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
ARDOUR::HeaderFormat _header_format;
Timecode::TimecodeFormat _timecode_format;
void on_parameter_changed(std::string);
PBD::ScopedConnection connection_with_session_config;
};

View file

@ -164,7 +164,6 @@ ARDOUR_UI::set_session (Session *s)
_session->locations()->added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context());
_session->locations()->removed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context());
_session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_parameter_changed, this, _1), gui_context ());
_session->config.ParameterChanged.connect_same_thread (connection_with_session_config, boost::bind (&ARDOUR_UI::on_parameter_changed, this, _1));
/* Clocks are on by default after we are connected to a session, so show that here.
*/

View file

@ -423,11 +423,12 @@ ARDOUR_UI::parameter_changed (std::string p)
}
void
ARDOUR_UI::session_parameter_changed (std::string p)
{
if (p == "native-file-data-format" || p == "native-file-header-format") {
update_format ();
}
ARDOUR_UI::session_parameter_changed (const std::string& param)
{
if (param == "native-file-data-format" || param == "native-file-header-format")
update_format();
if ( param == "timecode-format")
update_timecode_format();
}
void