diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/mtc_slave.cc | 7 | ||||
| -rw-r--r-- | libs/ardour/plugin_manager.cc | 8 | ||||
| -rw-r--r-- | libs/ardour/rb_effect.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session_rtevents.cc | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/keyboard.cc | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/motionfeedback.cc | 1 |
6 files changed, 12 insertions, 10 deletions
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<Region> 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<RouteList> 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); } } diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 81b9ae642a..9966972edb 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -531,7 +531,7 @@ Keyboard::load_keybindings (string path) } catch (...) { - error << string_compose (_("Ardour key bindings file not found at \"%1\" or contains errors."), path) + error << string_compose (_("key bindings file not found at \"%2\" or contains errors."), path) << endmsg; return false; } diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc index cb1d2cba88..44fb3e5f47 100644 --- a/libs/gtkmm2ext/motionfeedback.cc +++ b/libs/gtkmm2ext/motionfeedback.cc @@ -94,6 +94,7 @@ MotionFeedback::MotionFeedback (Glib::RefPtr<Gdk::Pixbuf> pix, hpacker = manage (new HBox); hpacker->pack_start (*value_packer, true, false); hpacker->show (); + hpacker->set_border_width (6); pack_start (*hpacker, false, false); |