From 241a9edd3eecf7d5062818ca391a2352500f9a01 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 5 Feb 2013 18:18:35 +0000 Subject: replace final(?) incidences of program name (ardour, Ardour) with PROGRAM_NAME (thanks to edgar for tracking them all down) git-svn-id: svn://localhost/ardour2/branches/3.0@14050 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/mtc_slave.cc | 7 ++++--- libs/ardour/plugin_manager.cc | 8 ++++---- libs/ardour/rb_effect.cc | 2 +- libs/ardour/session_rtevents.cc | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index eadc40646b..b3992598d3 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -389,9 +389,10 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now) if (cur_timecode != tc_format && ! printed_timecode_warning) { if (ceil(Timecode::timecode_to_frames_per_second(cur_timecode)) != ceil(Timecode::timecode_to_frames_per_second(tc_format))) { - warning << string_compose(_("Session and MTC framerate mismatch: MTC:%1 Ardour:%2."), - Timecode::timecode_format_name(tc_format), - Timecode::timecode_format_name(cur_timecode)) + warning << string_compose(_("Session and MTC framerate mismatch: MTC:%1 %2:%3."), + Timecode::timecode_format_name(tc_format), + PROGRAM_NAME, + Timecode::timecode_format_name(cur_timecode)) << endmsg; } printed_timecode_warning = true; diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 6a24a33b60..9bd40cb1ae 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -597,8 +597,8 @@ PluginManager::windows_vst_discover (string path) } if (!finfo->canProcessReplacing) { - warning << string_compose (_("VST plugin %1 does not support processReplacing, and so cannot be used in ardour at this time"), - finfo->name) + warning << string_compose (_("VST plugin %1 does not support processReplacing, and so cannot be used in %2 at this time"), + finfo->name, PROGRAM_NAME) << endl; } @@ -701,8 +701,8 @@ PluginManager::lxvst_discover (string path) } if (!finfo->canProcessReplacing) { - warning << string_compose (_("linuxVST plugin %1 does not support processReplacing, and so cannot be used in ardour at this time"), - finfo->name) + warning << string_compose (_("linuxVST plugin %1 does not support processReplacing, and so cannot be used in %2 at this time"), + finfo->name, PROGRAM_NAME) << endl; } diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc index f3adaec22c..a5d47d2668 100644 --- a/libs/ardour/rb_effect.cc +++ b/libs/ardour/rb_effect.cc @@ -329,7 +329,7 @@ RBEffect::run (boost::shared_ptr r, Progress* progress) } } catch (runtime_error& err) { - error << _("timefx code failure. please notify ardour-developers.") << endmsg; + error << string_compose (_("programming error: %1"), X_("timefx code failure")) << endmsg; error << err.what() << endmsg; goto out; } diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc index 3afce0c898..2b52b3b28a 100644 --- a/libs/ardour/session_rtevents.cc +++ b/libs/ardour/session_rtevents.cc @@ -150,7 +150,7 @@ void Session::rt_set_mute (boost::shared_ptr rl, bool yn, bool /*group_override*/) { for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_hidden()) { + if (!(*i)->is_monitor() && !(*i)->is_hidden()) { (*i)->set_mute (yn, this); } } -- cgit v1.2.3