fix merge conflicts from master

gtk2_ardour/add_video_dialog.cc

@@ -42,6 +42,7 @@ using namespace Gtk;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 #define PREVIEW_WIDTH (240)
 #define PREVIEW_HEIGHT (180)
@@ -482,7 +483,7 @@ AddVideoDialog::harvid_request(std::string u)
 
 	harvid_list->clear();
 
-	char *res = curl_http_get(url, &status);
+	char *res = a3_curl_http_get(url, &status);
 	if (status != 200) {
 		printf("request failed\n"); // XXX
 		harvid_path.set_text(" - request failed -");
@@ -662,7 +663,7 @@ AddVideoDialog::request_preview(std::string u)
 		, (long long) (video_duration * seek_slider.get_value() / 1000.0)
 		, clip_width, clip_height, u.c_str());
 
-	char *data = curl_http_get(url, NULL);
+	char *data = a3_curl_http_get(url, NULL);
 	if (!data) {
 		printf("image preview request failed %s\n", url);
 		imgbuf->fill(RGBA_TO_UINT(0,0,0,255));

gtk2_ardour/ardour_ui.cc

@@ -186,6 +186,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	, feedback_alert_button (_("feedback"))
 
 	, editor_meter(0)
+	, editor_meter_peak_display()
 
 	, speaker_config_window (X_("speaker-config"), _("Speaker Configuration"))
 	, theme_manager (X_("theme-manager"), _("Theme Manager"))
@@ -293,22 +294,11 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
 	/* lets get this party started */
 
-	try {
-		if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
-			throw failed_constructor ();
-		}
-
 	setup_gtk_ardour_enums ();
 	setup_profile ();
 
 	SessionEvent::create_per_thread_pool ("GUI", 512);
 
-	} catch (failed_constructor& err) {
-		error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
-		// pass it on up
-		throw;
-	}
-
 	/* we like keyboards */
 
 	keyboard = new ArdourKeyboard(*this);
@@ -1039,8 +1029,14 @@ ARDOUR_UI::every_point_zero_something_seconds ()
 	// august 2007: actual update frequency: 25Hz (40ms), not 100Hz
 
 	SuperRapidScreenUpdate(); /* EMIT_SIGNAL */
-	if (editor_meter) {
+	if (editor_meter && Config->get_show_editor_meter()) {
-		editor_meter->update_meters();
+		float mpeak = editor_meter->update_meters();
+		if (mpeak > editor_meter_max_peak) {
+			if (mpeak >= Config->get_meter_peak()) {
+				editor_meter_peak_display.set_name ("meterbridge peakindicator on");
+				editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+			}
+		}
 	}
 	return TRUE;
 }
@@ -3530,7 +3526,10 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
 					return;
 				}
 				if (!transcode_video_dialog->get_audiofile().empty()) {
-					editor->embed_audio_from_video(transcode_video_dialog->get_audiofile());
+					editor->embed_audio_from_video(
+							transcode_video_dialog->get_audiofile(),
+							video_timeline->get_offset()
+							);
 				}
 				switch (transcode_video_dialog->import_option()) {
 					case VTL_IMPORT_TRANSCODED:
@@ -3594,6 +3593,10 @@ ARDOUR_UI::remove_video ()
 	video_timeline->close_session();
 	editor->toggle_ruler_video(false);
 
+	/* reset state */
+	video_timeline->set_offset_locked(false);
+	video_timeline->set_offset(0);
+
 	/* delete session state */
 	XMLNode* node = new XMLNode(X_("Videotimeline"));
 	_session->add_extra_xml(*node);
@@ -4138,6 +4141,9 @@ ARDOUR_UI::reset_peak_display ()
 {
 	if (!_session || !_session->master_out() || !editor_meter) return;
 	editor_meter->clear_meters();
+	editor_meter_max_peak = -INFINITY;
+	editor_meter_peak_display.set_name ("meterbridge peakindicator");
+	editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
 }
 
 void

gtk2_ardour/ardour_ui.h

@@ -451,6 +451,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	Gtk::VBox alert_box;
 	Gtk::VBox meter_box;
 	LevelMeterHBox * editor_meter;
+	float            editor_meter_max_peak;
+	ArdourButton     editor_meter_peak_display;
+	bool             editor_meter_peak_button_release (GdkEventButton*);
 
 	void solo_blink (bool);
 	void sync_blink (bool);

gtk2_ardour/ardour_ui2.cc

@@ -144,6 +144,7 @@ ARDOUR_UI::setup_tooltips ()
 	set_tip (feedback_alert_button, _("When active, there is a feedback loop."));
 	set_tip (primary_clock, _("<b>Primary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
 	set_tip (secondary_clock, _("<b>Secondary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
+	set_tip (editor_meter_peak_display, _("Reset Level Meter"));
 
 	synchronize_sync_source_and_video_pullup ();
 
@@ -418,6 +419,7 @@ ARDOUR_UI::setup_transport ()
         }
 	transport_tearoff_hbox.pack_start (alert_box, false, false);
 	transport_tearoff_hbox.pack_start (meter_box, false, false);
+	transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
 
 	if (Profile->get_sae()) {
 		Image* img = manage (new Image ((::get_icon (X_("sae")))));

gtk2_ardour/ardour_ui_dialogs.cc

@@ -57,6 +57,8 @@
 #include "theme_manager.h"
 #include "time_info_box.h"
 
+#include <gtkmm2ext/keyboard.h>
+
 #include "i18n.h"
 
 using namespace ARDOUR;
@@ -196,6 +198,7 @@ ARDOUR_UI::set_session (Session *s)
 		meter_box.remove(*editor_meter);
 		delete editor_meter;
 		editor_meter = 0;
+		editor_meter_peak_display.hide();
 	}
 
 	if (_session && _session->master_out()) {
@@ -204,11 +207,29 @@ ARDOUR_UI::set_session (Session *s)
 		editor_meter->clear_meters();
 		editor_meter->set_type (_session->master_out()->meter_type());
 		editor_meter->setup_meters (30, 12, 6);
+		editor_meter->show();
 		meter_box.pack_start(*editor_meter);
 
 		ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
 		ArdourMeter::ResetRoutePeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_route_peak_display));
 		ArdourMeter::ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_group_peak_display));
+
+		editor_meter_peak_display.set_name ("meterbridge peakindicator");
+		editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+		editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS);
+		editor_meter_peak_display.set_size_request(6, -1);
+		editor_meter_peak_display.set_corner_radius(2);
+
+		editor_meter_max_peak = -INFINITY;
+		editor_meter_peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::editor_meter_peak_button_release), false);
+
+		if (Config->get_show_editor_meter()) {
+			meter_box.show();
+			editor_meter_peak_display.show();
+		} else {
+			meter_box.hide();
+			editor_meter_peak_display.hide();
+		}
 	}
 
 }
@@ -254,6 +275,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 		meter_box.remove(*editor_meter);
 		delete editor_meter;
 		editor_meter = 0;
+		editor_meter_peak_display.hide();
 	}
 
 	ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false);
@@ -528,3 +550,18 @@ ARDOUR_UI::main_window_state_event_handler (GdkEventWindowState* ev, bool window
 
 	return false;
 }
+
+bool
+ARDOUR_UI::editor_meter_peak_button_release (GdkEventButton* ev)
+{
+	if (ev->button == 1 && Gtkmm2ext::Keyboard::modifier_state_equals (ev->state, Gtkmm2ext::Keyboard::PrimaryModifier|Gtkmm2ext::Keyboard::TertiaryModifier)) {
+		ArdourMeter::ResetAllPeakDisplays ();
+	} else if (ev->button == 1 && Gtkmm2ext::Keyboard::modifier_state_equals (ev->state, Gtkmm2ext::Keyboard::PrimaryModifier)) {
+		if (_session->master_out()) {
+			ArdourMeter::ResetGroupPeakDisplays (_session->master_out()->route_group());
+		}
+	} else if (_session->master_out()) {
+		ArdourMeter::ResetRoutePeakDisplays (_session->master_out().get());
+	}
+	return true;
+}

gtk2_ardour/ardour_ui_options.cc

@@ -413,6 +413,15 @@ ARDOUR_UI::parameter_changed (std::string p)
 	} else if (p == "super-rapid-clock-update") {
 		stop_clocking ();
 		start_clocking ();
+	} else if (p == "show-editor-meter") {
+		bool show = Config->get_show_editor_meter();
+		if (editor_meter && show) {
+			meter_box.show();
+			editor_meter_peak_display.show();
+		} else if (editor_meter && !show) {
+			meter_box.hide();
+			editor_meter_peak_display.hide();
+		}
 	}
 }
 

gtk2_ardour/curvetest.cc

@@ -32,11 +32,6 @@ using namespace PBD;
 int
 curvetest (string filename)
 {
-	// needed to initialize ID objects/counter used
-	// by Curve et al.
-
-	PBD::ID::init ();
-
 	ifstream in (filename.c_str());
 	stringstream line;
 	//Evoral::Parameter param(GainAutomation, -1.0, +1.0, 0.0);

gtk2_ardour/editor_audio_import.cc

@@ -962,7 +962,5 @@ void *
 Editor::import_thread ()
 {
 	_session->import_files (import_status);
-	pthread_exit_pbd (0);
-	/*NOTREACHED*/
 	return 0;
 }

gtk2_ardour/editor_drag.cc

@@ -1665,7 +1665,7 @@ VideoTimeLineDrag::motion (GdkEvent* event, bool first_move)
 	}
 
 	framecnt_t dt = adjusted_current_frame (event) - raw_grab_frame() + _pointer_frame_offset;
-	dt = ARDOUR_UI::instance()->video_timeline->quantify_frames_to_apv(dt);
+	dt = ARDOUR_UI::instance()->video_timeline->quantify_frames_to_apv(_startdrag_video_offset+dt) - _startdrag_video_offset;
 
 	if (_max_backwards_drag >= 0 && dt <= - _max_backwards_drag) {
 		dt = - _max_backwards_drag;

gtk2_ardour/export_video_dialog.cc

@@ -62,6 +62,7 @@ using namespace Gtk;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
 	: ArdourDialog (_("Export Video File "))
@@ -105,7 +106,7 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
 	/* check if ffmpeg can be found */
 	transcoder = new TranscodeFfmpeg("");
 	if (!transcoder->ffexec_ok()) {
-		l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Export is not possible until you install those tools. See the Log widow for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+		l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Export is not possible until you install those tools. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
 		l->set_line_wrap();
 		vbox->pack_start (*l, false, false, 8);
 		get_vbox()->pack_start (*vbox, false, false);

gtk2_ardour/level_meter.cc

@@ -138,7 +138,7 @@ LevelMeterBase::update_meters ()
 			const float mpeak = _meter->meter_level(n, MeterMaxPeak);
 			if (mpeak > (*i).max_peak) {
 				(*i).max_peak = mpeak;
-				(*i).meter->set_highlight(mpeak > Config->get_meter_peak());
+				(*i).meter->set_highlight(mpeak >= Config->get_meter_peak());
 			}
 			if (mpeak > max_peak) {
 				max_peak = mpeak;

gtk2_ardour/lv2_plugin_ui.cc

@@ -184,11 +184,19 @@ LV2PluginUI::LV2PluginUI(boost::shared_ptr<PluginInsert> pi,
 	, _pi(pi)
 	, _lv2(lv2p)
 	, _gui_widget(NULL)
-	, _ardour_buttons_box(NULL)
 	, _values(NULL)
 	, _external_ui_ptr(NULL)
 	, _inst(NULL)
 {
+	_ardour_buttons_box.set_spacing (6);
+	_ardour_buttons_box.set_border_width (6);
+	_ardour_buttons_box.pack_end (focus_button, false, false);
+	_ardour_buttons_box.pack_end (bypass_button, false, false, 10);
+	_ardour_buttons_box.pack_end (delete_button, false, false);
+	_ardour_buttons_box.pack_end (save_button, false, false);
+	_ardour_buttons_box.pack_end (add_button, false, false);
+	_ardour_buttons_box.pack_end (_preset_combo, false, false);
+	_ardour_buttons_box.pack_end (_preset_modified, false, false);
 }
 
 void
@@ -219,18 +227,11 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
 		features[features_count - 1] = &_external_ui_feature;
 		features[features_count]     = NULL;
 	} else {
-		_ardour_buttons_box = manage (new Gtk::HBox);
+		if (_ardour_buttons_box.get_parent()) {
-		_ardour_buttons_box->set_spacing (6);
+			_ardour_buttons_box.get_parent()->remove(_ardour_buttons_box);
-		_ardour_buttons_box->set_border_width (6);
+		}
-		_ardour_buttons_box->pack_end (focus_button, false, false);
+		pack_start(_ardour_buttons_box, false, false);
-		_ardour_buttons_box->pack_end (bypass_button, false, false, 10);
+		_ardour_buttons_box.show_all();
-		_ardour_buttons_box->pack_end (delete_button, false, false);
-		_ardour_buttons_box->pack_end (save_button, false, false);
-		_ardour_buttons_box->pack_end (add_button, false, false);
-		_ardour_buttons_box->pack_end (_preset_combo, false, false);
-		_ardour_buttons_box->pack_end (_preset_modified, false, false);
-		_ardour_buttons_box->show_all();
-		pack_start(*_ardour_buttons_box, false, false);
 
 		_gui_widget = Gtk::manage((container = new Gtk::Alignment()));
 		pack_start(*_gui_widget, true, true);

gtk2_ardour/lv2_plugin_ui.h

@@ -73,7 +73,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox
 	sigc::connection                     _screen_update_connection;
 	Gtk::Widget*                         _gui_widget;
 	/** a box containing the focus, bypass, delete, save / add preset buttons etc. */
-	Gtk::HBox*                           _ardour_buttons_box;
+	Gtk::HBox                            _ardour_buttons_box;
 	float*                               _values;
 	std::vector<ControllableRef>         _controllables;
 	struct lv2_external_ui_host          _external_ui_host;

gtk2_ardour/main.cc

@@ -483,10 +483,6 @@ int main (int argc, char *argv[])
 		exit (1);
 	}
 
-	if (curvetest_file) {
-		return curvetest (curvetest_file);
-	}
-
 	cout << PROGRAM_NAME
 	     << VERSIONSTRING
 	     << _(" (built using ")
@@ -514,7 +510,14 @@ int main (int argc, char *argv[])
 
 	/* some GUI objects need this */
 
-	PBD::ID::init ();
+	if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
+		error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
+		exit (1);
+	}
+
+	if (curvetest_file) {
+		return curvetest (curvetest_file);
+	}
 
 #ifndef WIN32
 	if (::signal (SIGPIPE, sigpipe_handler)) {

gtk2_ardour/midi_tracer.cc

@@ -306,8 +306,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len)
 		} else if (len == 3 && msg[0] == MIDI::position) {
 
 			/* MIDI Song Position */
-			uint16_t midi_beats = (uint16_t) msg[1];
+			int midi_beats = (msg[2] << 7) | msg[1];
-			midi_beats |= msg[2];
 			s += snprintf (&buf[s], bufsize, "%16s %d\n", "Position", (int) midi_beats);
 		} else {
 

gtk2_ardour/port_group.cc

@@ -574,8 +574,22 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
 	}
 
 	for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
-		if (!extra_other[*i].empty()) {
+		if (extra_other[*i].empty()) continue;
-			boost::shared_ptr<Bundle> b = make_bundle_from_ports (extra_other[*i], *i, inputs);
+		std::string cp;
+		std::vector<std::string> nb;
+		for (uint32_t j = 0; j < extra_other[*i].size(); ++j) {
+			std::string nn = extra_other[*i][j];
+			std::string pf = nn.substr (0, nn.find_first_of (":") + 1);
+			if (pf != cp && !nb.empty()) {
+				boost::shared_ptr<Bundle> b = make_bundle_from_ports (nb, *i, inputs);
+				other->add_bundle (b);
+				nb.clear();
+			}
+			cp = pf;
+			nb.push_back(extra_other[*i][j]);
+		}
+		if (!nb.empty()) {
+			boost::shared_ptr<Bundle> b = make_bundle_from_ports (nb, *i, inputs);
 			other->add_bundle (b);
 		}
 	}

gtk2_ardour/port_matrix.cc

@@ -336,6 +336,13 @@ PortMatrix::select_arrangement ()
 		_vbox.pack_end (_vnotebook, false, false);
 		_vbox.pack_end (_vspacer, true, true);
 
+#define REMOVE_FROM_GTK_PARENT(WGT) if ((WGT).get_parent()) { (WGT).get_parent()->remove(WGT);}
+		REMOVE_FROM_GTK_PARENT(*_body)
+		REMOVE_FROM_GTK_PARENT(_vscroll)
+		REMOVE_FROM_GTK_PARENT(_hscroll)
+		REMOVE_FROM_GTK_PARENT(_vbox)
+		REMOVE_FROM_GTK_PARENT(_hbox)
+
 		attach (*_body, 2, 3, 1, 2, FILL | EXPAND, FILL | EXPAND);
 		attach (_vscroll, 3, 4, 1, 2, SHRINK);
 		attach (_hscroll, 2, 3, 3, 4, FILL | EXPAND, SHRINK);
@@ -355,6 +362,12 @@ PortMatrix::select_arrangement ()
 		_vbox.pack_end (_vnotebook, false, false);
 		_vbox.pack_end (_vlabel, false, false);
 
+		REMOVE_FROM_GTK_PARENT(*_body)
+		REMOVE_FROM_GTK_PARENT(_vscroll)
+		REMOVE_FROM_GTK_PARENT(_hscroll)
+		REMOVE_FROM_GTK_PARENT(_vbox)
+		REMOVE_FROM_GTK_PARENT(_hbox)
+
 		attach (*_body, 1, 2, 2, 3, FILL | EXPAND, FILL | EXPAND);
 		attach (_vscroll, 3, 4, 2, 3, SHRINK);
 		attach (_hscroll, 1, 2, 3, 4, FILL | EXPAND, SHRINK);
@@ -733,7 +746,7 @@ PortMatrix::remove_channel (ARDOUR::BundleChannel b)
 			int const r = io->remove_port (p, this);
 			if (r == -1) {
 				ArdourDialog d (_("Port removal not allowed"));
-				Label l (_("This port cannot be removed, as the first plugin in the track or buss cannot accept the new number of inputs."));
+				Label l (_("This port cannot be removed.\nEither the first plugin in the track or buss cannot accept\nthe new number of inputs or the last plugin has more outputs."));
 				d.get_vbox()->pack_start (l);
 				d.add_button (Stock::OK, RESPONSE_ACCEPT);
 				d.set_modal (true);

gtk2_ardour/rc_option_editor.cc

@@ -1315,6 +1315,14 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_track_meters)
 		     ));
 
+	add_option (_("Editor"),
+	     new BoolOption (
+		     "show-editor-meter",
+		     _("Display master-meter in the toolbar"),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_editor_meter),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_editor_meter)
+		     ));
+
 	bco = new BoolComboOption (
 		     "use-overlap-equivalency",
 		     _("Regions in active edit groups are edited together"),

gtk2_ardour/send_ui.cc

@@ -113,6 +113,10 @@ SendUI::update ()
 void
 SendUI::fast_update ()
 {
+	if (!is_mapped()) {
+		return;
+	}
+
 	if (Config->get_meter_falloff() > 0.0f) {
 		_gpm.update_meters ();
 	}

gtk2_ardour/sfdb_ui.cc

@@ -66,9 +66,7 @@
 #include "main_clock.h"
 #include "public_editor.h"
 
-#ifdef FREESOUND
 #include "sfdb_freesound_mootcher.h"
-#endif
 
 #include "i18n.h"
 
@@ -518,8 +516,6 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi
 	
 	notebook.append_page (*vbox, _("Search Tags"));
 
-#ifdef FREESOUND
-
 	//add freesound search
 
 	HBox* passbox;
@@ -595,7 +591,6 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi
 	freesound_more_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_more_clicked));
 	freesound_similar_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_similar_clicked));
 	notebook.append_page (*vbox, _("Search Freesound"));
-#endif
 
 	notebook.set_size_request (500, -1);
 	notebook.signal_switch_page().connect (sigc::hide_return (sigc::hide (sigc::hide (sigc::mem_fun (*this, &SoundFileBrowser::reset_options)))));
@@ -1151,7 +1146,6 @@ SoundFileBrowser::get_paths ()
 			results.push_back (str);
 		}
 	} else {
-#ifdef FREESOUND
 		ListPath rows = freesound_list_view.get_selection()->get_selected_rows ();
 		for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
 			string str = freesound_get_audio_file (freesound_list->get_iter(*i));
@@ -1159,7 +1153,6 @@ SoundFileBrowser::get_paths ()
 				results.push_back (str);
 			}
 		}
-#endif
 	}
 
 	return results;

gtk2_ardour/transcode_ffmpeg.cc

@@ -37,6 +37,7 @@
 #endif
 
 using namespace PBD;
+using namespace VideoUtils;
 
 TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
 	: infile(f)

gtk2_ardour/transcode_video_dialog.cc

@@ -52,6 +52,7 @@ using namespace Gtk;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 	: ArdourDialog (_("Transcode/Import Video File "))
@@ -111,7 +112,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 
 	bool ffok = false;
 	if (!transcoder->ffexec_ok()) {
-		l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Import is not possible until you install those tools. See the Log widow for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+		l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Import is not possible until you install those tools. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
 		l->set_line_wrap();
 		options_box->pack_start (*l, false, true, 4);
 		aspect_checkbox.set_sensitive(false);

gtk2_ardour/utils_videotl.cc

@@ -35,9 +35,10 @@ using namespace Gtk;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 bool
-confirm_video_outfn (std::string outfn, std::string docroot)
+VideoUtils::confirm_video_outfn (std::string outfn, std::string docroot)
 {
 	/* replace docroot's '/' to G_DIR_SEPARATOR for the comparison */
 	size_t look_here = 0;
@@ -77,7 +78,7 @@ confirm_video_outfn (std::string outfn, std::string docroot)
 }
 
 std::string
-video_dest_dir (const std::string sessiondir, const std::string docroot)
+VideoUtils::video_dest_dir (const std::string sessiondir, const std::string docroot)
 {
 	std::string dir = docroot;
 	if (dir.empty() || !dir.compare(0, dir.length(), sessiondir, 0, dir.length())) {
@@ -92,7 +93,7 @@ video_dest_dir (const std::string sessiondir, const std::string docroot)
 }
 
 std::string
-video_get_docroot (ARDOUR::RCConfiguration* config)
+VideoUtils::video_get_docroot (ARDOUR::RCConfiguration* config)
 {
 	if (config->get_video_advanced_setup()) {
 		return config->get_video_server_docroot();
@@ -101,7 +102,7 @@ video_get_docroot (ARDOUR::RCConfiguration* config)
 }
 
 std::string
-video_get_server_url (ARDOUR::RCConfiguration* config)
+VideoUtils::video_get_server_url (ARDOUR::RCConfiguration* config)
 {
 	if (config->get_video_advanced_setup()) {
 		return config->get_video_server_url();
@@ -111,7 +112,7 @@ video_get_server_url (ARDOUR::RCConfiguration* config)
 
 
 std::string
-strip_file_extension (const std::string infile)
+VideoUtils::strip_file_extension (const std::string infile)
 {
 	std::string rv;
 	char *ext, *bn = strdup(infile.c_str());
@@ -126,7 +127,7 @@ strip_file_extension (const std::string infile)
 }
 
 std::string
-get_file_extension (const std::string infile)
+VideoUtils::get_file_extension (const std::string infile)
 {
 	std::string rv = "";
 	char *ext, *bn = strdup(infile.c_str());
@@ -140,13 +141,13 @@ get_file_extension (const std::string infile)
 }
 
 std::string
-video_dest_file (const std::string dir, const std::string infile)
+VideoUtils::video_dest_file (const std::string dir, const std::string infile)
 {
 	return dir + "a3_" + strip_file_extension(Glib::path_get_basename(infile)) + ".avi";
 }
 
 std::string
-video_map_path (std::string server_docroot, std::string filepath)
+VideoUtils::video_map_path (std::string server_docroot, std::string filepath)
 {
 	std::string rv = filepath;
 
@@ -179,7 +180,7 @@ video_map_path (std::string server_docroot, std::string filepath)
 }
 
 void
-ParseCSV (const std::string &csv, std::vector<std::vector<std::string> > &lines)
+VideoUtils::ParseCSV (const std::string &csv, std::vector<std::vector<std::string> > &lines)
 {
 	bool inQuote(false);
 	bool newLine(false);
@@ -236,7 +237,7 @@ ParseCSV (const std::string &csv, std::vector<std::vector<std::string> > &lines)
 }
 
 bool
-video_query_info (
+VideoUtils::video_query_info (
 		std::string video_server_url,
 		std::string filepath,
 		double &video_file_fps,
@@ -247,54 +248,32 @@ video_query_info (
 {
 	char url[2048];
 
-	snprintf(url, sizeof(url), "%s%sinfo/?file=%s&format=plain"
+	snprintf(url, sizeof(url), "%s%sinfo/?file=%s&format=csv"
 			, video_server_url.c_str()
 			, (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
 			, filepath.c_str());
-	char *res = curl_http_get(url, NULL);
+	char *res = a3_curl_http_get(url, NULL);
-	int pid=0;
+	if (!res) {
-#ifndef COMPILER_MINGW
-	if (res) {
-		char *pch, *pst;
-		int version;
-		pch = strtok_r(res, "\n", &pst);
-		while (pch) {
-#if 0 /* DEBUG */
-			printf("VideoFileInfo [%i] -> '%s'\n", pid, pch);
-#endif
-			switch (pid) {
-				case 0:
-				  version = atoi(pch);
-					if (version != 1) break;
-				case 1:
-				  video_file_fps = atof(pch);
-					break;
-				case 2:
-					video_duration = atoll(pch);
-					break;
-				case 3:
-					video_start_offset = atof(pch);
-					break;
-				case 4:
-					video_aspect_ratio = atof(pch);
-					break;
-				default:
-					break;
-			}
-			pch = strtok_r(NULL,"\n", &pst);
-			++pid;
-		}
-	  free(res);
-	}
-#endif
-	if (pid!=5) {
 		return false;
 	}
+
+	std::vector<std::vector<std::string> > lines;
+	ParseCSV(std::string(res), lines);
+	free(res);
+
+	if (lines.empty() || lines.at(0).empty() || lines.at(0).size() != 6) {
+		return false;
+	}
+	if (atoi(lines.at(0).at(0)) != 1) return false; // version
+	video_start_offset = 0.0;
+	video_aspect_ratio = atof (lines.at(0).at(3));
+	video_file_fps = atof (lines.at(0).at(4));
+	video_duration = atoll(lines.at(0).at(5));
 	return true;
 }
 
 void
-video_draw_cross (Glib::RefPtr<Gdk::Pixbuf> img)
+VideoUtils::video_draw_cross (Glib::RefPtr<Gdk::Pixbuf> img)
 {
 
 	int rowstride = img->get_rowstride();
@@ -321,7 +300,7 @@ video_draw_cross (Glib::RefPtr<Gdk::Pixbuf> img)
 extern "C" {
 #include <curl/curl.h>
 
-	struct MemoryStruct {
+	struct A3MemoryStruct {
 		char *data;
 		size_t size;
 	};
@@ -329,7 +308,7 @@ extern "C" {
 	static size_t
 	WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) {
 		size_t realsize = size * nmemb;
-		struct MemoryStruct *mem = (struct MemoryStruct *)data;
+		struct A3MemoryStruct *mem = (struct A3MemoryStruct *)data;
 
 		mem->data = (char *)realloc(mem->data, mem->size + realsize + 1);
 		if (mem->data) {
@@ -340,10 +319,10 @@ extern "C" {
 		return realsize;
 	}
 
-	char *curl_http_get (const char *u, int *status) {
+	char *a3_curl_http_get (const char *u, int *status) {
 		CURL *curl;
 		CURLcode res;
-		struct MemoryStruct chunk;
+		struct A3MemoryStruct chunk;
 		long int httpstatus;
 		if (status) *status = 0;
 		//usleep(500000); return NULL; // TEST & DEBUG
@@ -372,7 +351,7 @@ extern "C" {
 		if (status) *status = httpstatus;
 		if (res) {
 #ifdef CURLERRORDEBUG
-			printf("curl_http_get() failed: %s\n", curlerror);
+			printf("a3_curl_http_get() failed: %s\n", curlerror);
 #endif
 			return NULL;
 		}

gtk2_ardour/utils_videotl.h

@@ -32,6 +32,8 @@
 #include "ardour/template_utils.h"
 #include "ardour_dialog.h"
 
+namespace VideoUtils {
+
 bool confirm_video_outfn (std::string, std::string docroot="");
 std::string video_dest_dir (const std::string, const std::string);
 std::string video_dest_file (const std::string, const std::string);
@@ -52,9 +54,10 @@ bool video_query_info (
 		double &video_start_offset,
 		double &video_aspect_ratio
 		);
+};
 
 extern "C" {
-	char *curl_http_get (const char *u, int *status);
+	char *a3_curl_http_get (const char *u, int *status);
 }
 
 #endif /* __gtk_ardour_video_utils_h__ */

gtk2_ardour/video_image_frame.cc

@@ -36,6 +36,7 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Group& parent, int w, int h, std::string vsurl, std::string vfn)
 	: editor (ed)
@@ -196,8 +197,8 @@ http_get_thread (void *arg) {
 	int timeout = 1000; // * 5ms -> 5sec
 	char *res = NULL;
 	do {
-		res=curl_http_get(url, &status);
+		res=a3_curl_http_get(url, &status);
-		if (status == 503) Glib::usleep(5000); // try-again
+		if (status == 503) usleep(5000); // try-again
 	} while (status == 503 && --timeout > 0);
 
 	if (status != 200 || !res) {

gtk2_ardour/video_server_dialog.cc

@@ -45,6 +45,7 @@ using namespace Gtk;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 VideoServerDialog::VideoServerDialog (Session* s)
 	: ArdourDialog (_("Launch Video Server"))

gtk2_ardour/video_timeline.cc

@@ -45,6 +45,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Timecode;
+using namespace VideoUtils;
 
 VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height)
 	: editor (ed)
@@ -552,7 +553,7 @@ VideoTimeLine::check_server ()
 			, video_server_url.c_str()
 			, (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
 			);
-	char *res=curl_http_get(url, NULL);
+	char *res=a3_curl_http_get(url, NULL);
 	if (res) {
 		if (strstr(res, "status: ok, online.")) { ok = true; }
 		free(res);
@@ -574,7 +575,7 @@ VideoTimeLine::check_server_docroot ()
 			, video_server_url.c_str()
 			, (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
 			);
-	char *res=curl_http_get(url, NULL);
+	char *res=a3_curl_http_get(url, NULL);
 	if (!res) {
 		return false;
 	}
@@ -670,7 +671,7 @@ VideoTimeLine::flush_cache () {
 			, video_server_url.c_str()
 			, (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
 			);
-	char *res=curl_http_get(url, NULL);
+	char *res=a3_curl_http_get(url, NULL);
 	if (res) {
 		free (res);
 	}

gtk2_ardour/video_timeline.h

@@ -96,7 +96,7 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
 	float get_apv(); /* audio frames per video frame; */
 	ARDOUR::framecnt_t get_duration () { return video_duration;}
 	ARDOUR::frameoffset_t get_offset () { return video_offset;}
-	ARDOUR::frameoffset_t quantify_frames_to_apv (ARDOUR::frameoffset_t offset) { return floor(offset/get_apv())*get_apv(); }
+	ARDOUR::frameoffset_t quantify_frames_to_apv (ARDOUR::frameoffset_t offset) { return rint(offset/get_apv())*get_apv(); }
 	void set_offset (ARDOUR::frameoffset_t offset) { video_offset = quantify_frames_to_apv(offset); } // this function does not update video_offset_p, call save_undo() to finalize changes to this! - this fn is currently only used from editor_drag.cc
 
 	protected:

gtk2_ardour/wscript

@@ -103,6 +103,7 @@ gtk2_ardour_sources = [
         'fft.cc',
         'fft_graph.cc',
         'fft_result.cc',
+        'sfdb_freesound_mootcher.cc',
         'gain_meter.cc',
         'generic_pluginui.cc',
         'ghostregion.cc',
@@ -438,10 +439,6 @@ def build(bld):
         obj.source += [ 'lv2_plugin_ui.cc' ]
         obj.use += [ 'SUIL' ]
 
-    if bld.is_defined('FREESOUND'):
-        obj.source +=  [ 'sfdb_freesound_mootcher.cc' ]
-        obj.defines += [ 'FREESOUND' ]
-
     if bld.is_defined('NEED_INTL'):
         obj.linkflags = ' -lintl'
 

libs/ardour/ardour/ardour.h

@@ -50,7 +50,15 @@ namespace ARDOUR {
 	extern PBD::Signal1<void,std::string> BootMessage;
 	extern PBD::Signal0<void> GUIIdle;
 
-	int init (bool with_vst, bool try_optimization, const char* localedir);
+	/**
+	 * @param with_vst true to enable VST Support
+	 * @param try_optimization true to enable hardware optimized routines
+	 * for mixing, finding peak values etc.
+	 * @param localedir Directory to look for localisation files
+	 *
+	 * @return true if Ardour library was successfully initialized
+	 */
+	bool init (bool with_vst, bool try_optimization, const char* localedir);
 	void init_post_engine ();
 	int cleanup ();
 	bool no_auto_connect ();

libs/ardour/ardour/audio_diskstream.h

@@ -152,6 +152,7 @@ class AudioDiskstream : public Diskstream
 	friend class AudioTrack;
 
         int  process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_disk_signal);
+        frameoffset_t calculate_playback_distance (pframes_t nframes);
 	bool commit  (framecnt_t);
 
   private:

libs/ardour/ardour/diskstream.h

@@ -193,6 +193,7 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	friend class Track;
 
     virtual int  process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_disk_signal) = 0;
+    virtual frameoffset_t calculate_playback_distance (pframes_t nframes) = 0;
 	virtual bool commit  (framecnt_t) = 0;
 
 	//private:

libs/ardour/ardour/export_format_base.h

@@ -49,6 +49,7 @@ class ExportFormatBase {
 		F_None = 0,
 		F_WAV = SF_FORMAT_WAV,
 		F_W64 = SF_FORMAT_W64,
+		F_CAF = SF_FORMAT_CAF,
 		F_AIFF = SF_FORMAT_AIFF,
 		F_AU = SF_FORMAT_AU,
 		F_IRCAM = SF_FORMAT_IRCAM,

libs/ardour/ardour/midi_diskstream.h

@@ -125,6 +125,7 @@ class MidiDiskstream : public Diskstream
 	friend class MidiTrack;
 
         int  process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_diskstream);
+        frameoffset_t calculate_playback_distance (pframes_t nframes);
 	bool commit  (framecnt_t nframes);
 	static framecnt_t midi_readahead;
 

libs/ardour/ardour/rc_configuration_vars.h

@@ -154,6 +154,7 @@ CONFIG_VARIABLE (MeterLineUp, meter_line_up_level, "meter-line-up-level", Meteri
 CONFIG_VARIABLE (MeterLineUp, meter_line_up_din, "meter-line-up-din", MeteringLineUp15)
 CONFIG_VARIABLE (float, meter_peak, "meter-peak", 0.0f)
 CONFIG_VARIABLE (bool, meter_style_led, "meter-style-led", true)
+CONFIG_VARIABLE (bool, show_editor_meter, "show-editor-meter", true)
 
 /* miscellany */
 

libs/ardour/ardour/route.h

@@ -530,6 +530,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 	void silence_unlocked (framecnt_t);
 
 	ChanCount processor_max_streams;
+	ChanCount processor_out_streams;
 
 	uint32_t pans_required() const;
 	ChanCount n_process_buffers ();
@@ -553,8 +554,10 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 	void output_change_handler (IOChange, void *src);
 
 	bool input_port_count_changing (ChanCount);
+	bool output_port_count_changing (ChanCount);
 
 	bool _in_configure_processors;
+	bool _initial_io_setup;
 
 	int configure_processors_unlocked (ProcessorStreams*);
 	std::list<std::pair<ChanCount, ChanCount> > try_configure_processors (ChanCount, ProcessorStreams *);

libs/ardour/ardour/session.h

@@ -1211,6 +1211,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	double            ltc_enc_cnt;
 	framepos_t        ltc_enc_off;
 	bool              restarting;
+	framepos_t        ltc_prev_cycle;
 
 	framepos_t        ltc_timecode_offset;
 	bool              ltc_timecode_negative_offset;

libs/ardour/audio_diskstream.cc

@@ -698,6 +698,31 @@ AudioDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t
 	return 0;
 }
 
+frameoffset_t
+AudioDiskstream::calculate_playback_distance (pframes_t nframes)
+{
+	frameoffset_t playback_distance = nframes;
+
+	if (record_enabled()) {
+		playback_distance = nframes;
+	} else if (_actual_speed != 1.0f && _actual_speed != -1.0f) {
+		interpolation.set_speed (_target_speed);
+		boost::shared_ptr<ChannelList> c = channels.reader();
+		int channel = 0;
+		for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan, ++channel) {
+			playback_distance = interpolation.interpolate (channel, nframes, NULL, NULL);
+		}
+	} else {
+		playback_distance = nframes;
+	}
+
+	if (_actual_speed < 0.0) {
+		return -playback_distance;
+	} else {
+		return playback_distance;
+	}
+}
+
 /** Update various things including playback_sample, read pointer on each channel's playback_buf
  *  and write pointer on each channel's capture_buf.  Also wout whether the butler is needed.
  *  @return true if the butler is required.
@@ -898,7 +923,7 @@ AudioDiskstream::internal_playback_seek (framecnt_t distance)
 	boost::shared_ptr<ChannelList> c = channels.reader();
 
 	for (chan = c->begin(); chan != c->end(); ++chan) {
-		(*chan)->playback_buf->increment_read_ptr (distance);
+		(*chan)->playback_buf->increment_read_ptr (llabs(distance));
 	}
 
 	if (first_recordable_frame < max_framepos) {

libs/ardour/audio_track.cc

@@ -313,6 +313,12 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 	Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
 
 	if (!lm.locked()) {
+		boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
+		framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
+		if (can_internal_playback_seek(llabs(playback_distance))) {
+			/* TODO should declick */
+			internal_playback_seek(playback_distance);
+		}
 		return 0;
 	}
 

libs/ardour/butler.cc

@@ -238,7 +238,7 @@ Butler::thread_work ()
 						break;
 
 					case Request::Quit:
-						pthread_exit_pbd (0);
+						return 0;
 						/*NOTREACHED*/
 						break;
 
@@ -372,8 +372,6 @@ restart:
 		empty_pool_trash ();
 	}
 
-	pthread_exit_pbd (0);
-	/*NOTREACHED*/
 	return (0);
 }
 
@@ -457,6 +455,7 @@ Butler::empty_pool_trash ()
 void
 Butler::drop_references ()
 {
+	cerr << "Butler drops pool trash\n";
 	SessionEvent::pool->set_trash (0);
 }
 

libs/ardour/enums.cc

@@ -509,6 +509,7 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (ExportFormatBase, F_RAW);
 	REGISTER_CLASS_ENUM (ExportFormatBase, F_FLAC);
 	REGISTER_CLASS_ENUM (ExportFormatBase, F_Ogg);
+	REGISTER_CLASS_ENUM (ExportFormatBase, F_CAF);
 	REGISTER (_ExportFormatBase_FormatId);
 
 	REGISTER_CLASS_ENUM (ExportFormatBase, E_FileDefault);

libs/ardour/export_format_manager.cc

@@ -178,6 +178,17 @@ ExportFormatManager::init_formats ()
 	fl_ptr->set_extension ("w64");
 	add_format (f_ptr);
 
+	f_ptr.reset (fl_ptr = new ExportFormatLinear ("CAF", ExportFormatBase::F_CAF));
+	fl_ptr->add_sample_format (ExportFormatBase::SF_U8);
+	fl_ptr->add_sample_format (ExportFormatBase::SF_16);
+	fl_ptr->add_sample_format (ExportFormatBase::SF_24);
+	fl_ptr->add_sample_format (ExportFormatBase::SF_32);
+	fl_ptr->add_sample_format (ExportFormatBase::SF_Float);
+	fl_ptr->add_sample_format (ExportFormatBase::SF_Double);
+	fl_ptr->set_default_sample_format (ExportFormatBase::SF_Float);
+	fl_ptr->set_extension ("caf");
+	add_format (f_ptr);
+
 	f_ptr.reset (fl_ptr = new ExportFormatLinear ("RAW", ExportFormatBase::F_RAW));
 	fl_ptr->add_sample_format (ExportFormatBase::SF_U8);
 	fl_ptr->add_sample_format (ExportFormatBase::SF_8);

libs/ardour/globals.cc

@@ -56,8 +56,6 @@
 #undef check /* stupid Apple and their un-namespaced, generic Carbon macros */
 #endif 
 
-#include <giomm.h>
-
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 
@@ -68,6 +66,7 @@
 #include "pbd/cpus.h"
 #include "pbd/error.h"
 #include "pbd/id.h"
+#include "pbd/pbd.h"
 #include "pbd/strsplit.h"
 #include "pbd/fpu.h"
 #include "pbd/file_utils.h"
@@ -115,6 +114,8 @@ using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
 
+bool libardour_initialized = false;
+
 compute_peak_t          ARDOUR::compute_peak = 0;
 find_peaks_t            ARDOUR::find_peaks = 0;
 apply_gain_to_buffer_t  ARDOUR::apply_gain_to_buffer = 0;
@@ -225,21 +226,19 @@ lotsa_files_please ()
 #endif
 }
 
-int
+bool
 ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir)
 {
-	if (!Glib::thread_supported()) {
+	if (libardour_initialized) {
-		Glib::thread_init();
+		return true;
 	}
 
-	// this really should be in PBD::init..if there was one
+	if (!PBD::init()) return false;
-	Gio::init ();
 
 #ifdef ENABLE_NLS
 	(void) bindtextdomain(PACKAGE, localedir);
 #endif
 
-	PBD::ID::init ();
 	SessionEvent::init_event_pool ();
 
 	SessionObject::make_property_quarks ();
@@ -281,7 +280,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 	Config = new RCConfiguration;
 
 	if (Config->load_state ()) {
-		return -1;
+		return false;
 	}
 
 	Config->set_use_windows_vst (use_windows_vst);
@@ -294,13 +293,13 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 
 #ifdef WINDOWS_VST_SUPPORT
 	if (Config->get_use_windows_vst() && fst_init (0)) {
-		return -1;
+		return false;
 	}
 #endif
 
 #ifdef LXVST_SUPPORT
 	if (Config->get_use_lxvst() && vstfx_init (0)) {
-		return -1;
+		return false;
 	}
 #endif
 
@@ -343,7 +342,9 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 	EventTypeMap::instance().new_parameter(EnvelopeAutomation);
 	EventTypeMap::instance().new_parameter(MidiCCAutomation);
 
-	return 0;
+	libardour_initialized = true;
+
+	return true;
 }
 
 void
@@ -379,7 +380,7 @@ ARDOUR::cleanup ()
 #ifdef LXVST_SUPPORT
 	vstfx_exit();
 #endif
-	EnumWriter::destroy ();
+	PBD::cleanup ();
 	return 0;
 }
 

libs/ardour/lv2_plugin.cc

@@ -1138,8 +1138,20 @@ LV2Plugin::write_from_ui(uint32_t       index,
                          const uint8_t* body)
 {
 	if (!_from_ui) {
-		_from_ui = new RingBuffer<uint8_t>(
+		size_t rbs = _session.engine().raw_buffer_size(DataType::MIDI) * NBUFS;
-			_session.engine().raw_buffer_size(DataType::MIDI) * NBUFS);
+		/* buffer data communication from plugin UI to plugin instance.
+		 * this buffer needs to potentially hold
+		 *   (port's minimumSize) * (audio-periods) / (UI-periods)
+		 * bytes.
+		 *
+		 *  e.g 48kSPS / 128fpp -> audio-periods = 375 Hz
+		 *  ui-periods = 25 Hz (SuperRapidScreenUpdate)
+		 *  default minimumSize = 32K (see LV2Plugin::allocate_atom_event_buffers()
+		 *  -> 15 * 32K
+		 * it is safe to overflow (but the plugin state may be inconsistent).
+		 */
+		rbs = max((size_t) 32768 * 6, rbs);
+		_from_ui = new RingBuffer<uint8_t>(rbs);
 	}
 
 	if (!write_to(_from_ui, index, protocol, size, body)) {
@@ -1166,8 +1178,10 @@ void
 LV2Plugin::enable_ui_emmission()
 {
 	if (!_to_ui) {
-		_to_ui = new RingBuffer<uint8_t>(
+		/* see note in LV2Plugin::write_from_ui() */
-			_session.engine().raw_buffer_size(DataType::MIDI) * NBUFS);
+		size_t rbs = _session.engine().raw_buffer_size(DataType::MIDI) * NBUFS;
+		rbs = max((size_t) 32768 * 8, rbs);
+		_to_ui = new RingBuffer<uint8_t>(rbs);
 	}
 }
 
@@ -1354,11 +1368,6 @@ LV2Plugin::describe_parameter(Evoral::Parameter which)
 			return X_("hidden");
 		}
 
-		if (lilv_port_has_property(_impl->plugin,
-					lilv_plugin_get_port_by_index(_impl->plugin, which.id()), _world.lv2_sampleRate)) {
-			return X_("hidden");
-		}
-
 		if (lilv_port_has_property(_impl->plugin,
 					lilv_plugin_get_port_by_index(_impl->plugin, which.id()), _world.lv2_reportsLatency)) {
 			return X_("latency");
@@ -1902,7 +1911,7 @@ LV2Plugin::Impl::designated_input (const char* uri, void** bufptrs[], void** buf
 	return port;
 }
 
-static bool lv2_filter (const string& str, void *arg)
+static bool lv2_filter (const string& str, void * /* arg*/)
 {
 	/* Not a dotfile, has a prefix before a period, suffix is "lv2" */
 	

libs/ardour/midi_diskstream.cc

@@ -516,6 +516,20 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t
 	return 0;
 }
 
+frameoffset_t
+MidiDiskstream::calculate_playback_distance (pframes_t nframes)
+{
+	frameoffset_t playback_distance = nframes;
+
+	/* XXX: should be doing varispeed stuff once it's implemented in ::process() above */
+
+	if (_actual_speed < 0.0) {
+		return -playback_distance;
+	} else {
+		return playback_distance;
+	}
+}
+
 bool
 MidiDiskstream::commit (framecnt_t playback_distance)
 {

libs/ardour/midi_track.cc

@@ -318,6 +318,12 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
 {
 	Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
 	if (!lm.locked()) {
+		boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream();
+		framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
+		if (can_internal_playback_seek(llabs(playback_distance))) {
+			/* TODO should declick, and/or note-off */
+			internal_playback_seek(playback_distance);
+		}
 		return 0;
 	}
 

libs/ardour/po/cs.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
-"PO-Revision-Date: 2013-03-03 09:23+0100\n"
+"PO-Revision-Date: 2013-06-13 22:47+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -30,58 +30,58 @@ msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 "AudioDiskstream %1: není žádný seznam skladeb, který by bylo lze kopírovat!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: Při doplňování nelze číst %2 ze seznamu skladeb u snímku "
 "%3"
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "AudioDiskstream %1: Nelze číst %2 ze seznamu skladeb u snímku %3"
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "AudioDiskstream %1: Nelze zapisovat na disk"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "AudioDiskstream %1: Zachycená data nelze zapisovat na disk!"
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: Nepodařilo se vytvořit oblast pro úplný zvukový soubor"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 "AudioDiskstream: Nepodařilo se vytvořit oblast pro zaznamenaný zvukový "
 "materiál!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "Chyba v programování: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "AudioDiskstream: Kanál %1 překročení rozsahu"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1:%2 nový záznamový soubor neinicializován správně"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "%1: Nelze obnovit předběžný záznamový zdrojový soubor %2"
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 "%1: Seznam obsahuje nesprávný počet předběžných zdrojů - všechny jsou "
 "přehlíženy"
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 "%1: Z předběžných záznamových zdrojů nelze vytvořit žádnou oblast pro úplný "
@@ -133,7 +133,7 @@ msgstr "Seznamy zvukových skladeb (nepoužívané)"
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -215,7 +215,7 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr "Spojit sezení se strojem"
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
@@ -223,7 +223,7 @@ msgstr ""
 "Přípojka s názvem \"%1\" již existuje: Prověřte na zdvojené názvy stop/"
 "sběrnic"
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
@@ -231,35 +231,35 @@ msgstr ""
 "Nejsou dostupné další přípojky JACK. Pokud potřebujete tolik stop, musíte "
 "zastavit %1 a spustit JACK znovu s více přípojkami."
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "AudioEngine: Nelze zaregistrovat přípojku \"%1\": %2"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr "Nelze vytvořit přípojku: %1"
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr "Zavolání connect (spojení) před spuštěním stroje"
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "AudioEngine: Nelze spojit %1 (%2) s %3 (%4)"
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr "Zavolání disconnect (odpojení) před spuštěním stroje"
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr "Zavolání get_port_by_name() před spuštěním stroje"
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr "Zavolání get_ports před spuštěním stroje"
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "Nepodařilo se spojit se s JACK"
 
@@ -577,7 +577,7 @@ msgstr "Trojúhelníkový"
 msgid "Rectangular"
 msgstr "Obdélníkový"
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr "Žádný"
 
@@ -790,25 +790,25 @@ msgstr "Nelze určit nynější pracovní adresář (%1)"
 msgid "unknown file type for session %1"
 msgstr "Neznámý typ souboru pro sezení %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 "Nepodařilo se nastavit systémové omezení pro otevřené soubory na \"neomezeno"
 "\""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr "Nepodařilo se nastavit systémové omezení pro otevřené soubory na %1"
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr "Vaše systémové nastavení omezuje %1 na jen %2 otevřené soubory"
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr "Nepodařilo se dostat systémové omezení pro otevřené soubory (%1)"
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr "Nahrává se nastavení"
 
@@ -961,20 +961,20 @@ msgstr "P"
 msgid "%d"
 msgstr "%d"
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr "LADSPA: Modul nemá žádnou funkci popisu"
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr "LADSPA: Přídavný modul už není více nalezitelný!"
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 "LADSPA: \"%1\" nemůže být použit, neboť nedělá žádný \"inplace processing\""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
@@ -982,35 +982,35 @@ msgstr ""
 "Špatné číslo parametru pro přídavný modul \"%1\". To může značit změnu v "
 "návrhupřídavného modulu, a přednastavení jsou případně neplatná"
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr "Špatný uzel poslán LadspaPlugin::set_state"
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr "LADSPA: Žádné číslo přípojky LADSPA"
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr "LADSPA: Žádná data přípojky LADSPA"
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADSPA: Nelze nahrát modul z \"%1\""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr "Nepodařilo se najít HOME. Přednastavení neodstraněno."
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "Nepodařilo se vytvořit %1. Přednastavení neuloženo. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr "Chyba při ukládání souboru s přednastavením %1."
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "Nepodařilo se najít HOME. Přednastavení neuloženo."
 
@@ -1050,7 +1050,7 @@ msgstr "Locations: Pokus o použití neznámé polohy jako vybrané polohy"
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr "Nesprávný uzel XML předán dál Locations::set_state"
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr "Sezení"
 
@@ -1134,23 +1134,23 @@ msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 "MidiDiskstream %1: není žádný seznam skladeb, který by bylo lze kopírovat!"
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "MidiDiskstream %1: Nelze číst %2 ze seznamu skladeb u snímku %3"
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "MidiDiskstream %1: Nelze zapisovat na disk"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "MidiDiskstream %1: Zachycená data nelze zapisovat na disk!"
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr "%1: Nepodařilo se vytvořit oblast pro úplný soubor MIDI"
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 "MidiDiskstream: Nepodařilo se vytvořit oblast pro zaznamenaný materiál MIDI!"
@@ -1169,7 +1169,7 @@ msgstr "Převést"
 
 #: midi_patch_manager.cc:126
 msgid "Duplicate MIDI device `%1' in `%2' ignored"
-msgstr ""
+msgstr "Zdvojení zařízení MIDI `%1' v `%2' se přehlíží"
 
 #: midi_source.cc:125
 msgid "Missing parameter property on InterpolationStyle"
@@ -1189,7 +1189,7 @@ msgstr "Chybějící vlastnost \"state\" u AutomationState"
 
 #: midi_stretch.cc:85
 msgid "MIDI stretch created non-MIDI source"
-msgstr ""
+msgstr "Protažení MIDI vytvořilo zdroj, který není MIDI"
 
 #: monitor_processor.cc:53
 msgid "monitor dim"
@@ -1201,15 +1201,15 @@ msgstr "Přerušení sledování "
 
 #: monitor_processor.cc:55
 msgid "monitor mono"
-msgstr "Monitor Mono"
+msgstr "Mono sledování"
 
 #: monitor_processor.cc:58
 msgid "monitor dim level"
-msgstr "Síla hlasitosti pro Utlumit Monitor"
+msgstr "Síla hlasitosti pro utlumení sledování "
 
 #: monitor_processor.cc:62
 msgid "monitor solo boost level"
-msgstr "Síla hlasitosti pro Monitor Solo Boost"
+msgstr "Síla hlasitosti pro zdůraznění sóla sledování"
 
 #: monitor_processor.cc:512
 msgid "cut control %1"
@@ -1244,9 +1244,8 @@ msgid "Session framerate adjusted from %1 TO: MTC's %2."
 msgstr "Rychlost snímkování sezení změněna z %1 na MTC: %2"
 
 #: mtc_slave.cc:393
-#, fuzzy
 msgid "Session and MTC framerate mismatch: MTC:%1 %2:%3."
-msgstr "Rychlost snímkování sezení a MTC se neshodují: MTC: %1 Ardour: %2"
+msgstr "Rychlost snímkování sezení a MTC se neshodují: MTC: %1 %2:%3."
 
 #: operations.cc:24
 msgid "capture"
@@ -1350,23 +1349,35 @@ msgstr "Žádné ID seznamu skladeb v XML zdroje seznamu skladeb!"
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr "Nepodařilo se sestavit seznam skladeb ze zdrojových dat sezení!"
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "Chyba v programování:"
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr "Uzlu XML k popisu přídavného modulu chybí pole \"type\""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr "Neznámý typ přídavného modulu %1 ve vkládacím stavu přídavného modulu"
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr "Přídavný modul nemá žádné pole pro jedinečné ID"
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1374,15 +1385,15 @@ msgstr ""
 "Nalezen odkaz na neznámý přídavný modul (\"%1\").\n"
 "Snad byl od posledního použití odstraněn nebo přesunut."
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr "PluginInsert: Auto: Žádné číslo přípojky LADSPA"
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr "PluginInsert: Auto: Překročení rozsahu ID přípojky"
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 "PluginInsert: automatizovatelný prvek ovládání %1 nenalezen - přehlíží se"
@@ -1404,22 +1415,20 @@ msgid "LADSPA: module \"%1\" has no descriptor function."
 msgstr "LADSPA: Modul \"%1\" nemá žádnou funkci popisu."
 
 #: plugin_manager.cc:602
-#, fuzzy
 msgid ""
 "VST plugin %1 does not support processReplacing, and so cannot be used in %2 "
 "at this time"
 msgstr ""
 "Přídavný modul VST %1 nepodporuje processReplacing a z toho důvodu jej nyní "
-"nelze v Ardouru použít"
+"nelze v %2 použít"
 
 #: plugin_manager.cc:709
-#, fuzzy
 msgid ""
 "linuxVST plugin %1 does not support processReplacing, and so cannot be used "
 "in %2 at this time"
 msgstr ""
 "Přídavný modul linuxVST %1 nepodporuje processReplacing a z toho důvodu jej "
-"nyní nelze v Ardouru použít"
+"nyní nelze v %2 použít"
 
 #: plugin_manager.cc:870
 msgid "unknown plugin status type \"%1\" - all entries ignored"
@@ -1535,24 +1544,24 @@ msgstr "Zavedení: Chyba v src_new() : %1"
 msgid "return %1"
 msgstr "Vrácená hodnota: %1"
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr "Neznámý typ procesoru \"%1\"; přehlíží se"
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr "Procesor se nepodařilo vytvořit. Přehlíží se."
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr "Špatný uzel poslán Route::set_state() [%1]"
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 "Nalezen stav cíle vyvážení pro cestu (%1), aniž by bylo nalezeno vyvážení!"
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 "Špatně utvořený řetězec znaků pro klíč pořadí roztřídění v souboru sezení! "
@@ -1814,7 +1823,7 @@ msgstr "%1: Polohu souboru %2 nelze vyhledat pro vyvedení"
 msgid "Export ended unexpectedly: %1"
 msgstr "Vyvedení skončilo neočekávaně: %1"
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
@@ -1822,11 +1831,11 @@ msgstr ""
 "Kodér LTC: Neplatná rychlost snímkování - Kódování LTC je pro zbývající část "
 "tohoto sezení zakázáno."
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr "Sezení: Nepodařilo se poslat úplný časový kód MIDI"
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr "Sezení: Nelze poslat quarter-frame MTC (%1)"
 
@@ -1834,18 +1843,17 @@ msgstr "Sezení: Nelze poslat quarter-frame MTC (%1)"
 msgid "Session: cannot create Playlist from XML description."
 msgstr "Sezení: Nelze vytvořit seznam skladeb z popisu XML"
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr "Sezení: Chyba v no_roll pro %1"
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr "Chyba v programování: Neplatný typ události v process_event (%1)"
 
 #: session_state.cc:139
-#, fuzzy
 msgid "Could not use path %1 (%2)"
-msgstr "Nepodařilo se použít cestu %1 (%s)"
+msgstr "Nepodařilo se použít cestu %1 (%2)"
 
 #: session_state.cc:267
 msgid "solo cut control (dB)"
@@ -2210,7 +2218,7 @@ msgstr "Neznámý stav transportu JACK v Sync-Callback"
 msgid "Cannot loop - no loop range defined"
 msgstr "Nelze přehrávat ve smyčce - Nestanovena žádná oblast smyčky"
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
@@ -2218,7 +2226,7 @@ msgstr ""
 "Souvislé přehrávání ve smyčce není možné, dokud %1 používá transport JACK.\n"
 "Doporučuje se změna volby v nastavení"
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2227,25 +2235,20 @@ msgstr ""
 "dokud je %1 spojen s transportem JACK."
 
 #: smf_source.cc:252
-#, fuzzy
 msgid "Unable to read event prefix, corrupt MIDI ring"
-msgstr ""
+msgstr "Nelze přečíst předponu události, poškozen okraj MIDI"
-"Nelze přečíst předponu události, poškozená kruhová vyrovnávací paměť MIDI"
 
 #: smf_source.cc:265
-#, fuzzy
 msgid "Event has time and size but no body, corrupt MIDI ring"
-msgstr ""
+msgstr "Událost má čas a velikost, ale nemá tělo, poškozen okraj MIDI"
-"Přečteny čas/velikost, ale ne vyrovnávací paměť, poškozená kruhová "
-"vyrovnávací paměť MIDI"
 
 #: smf_source.cc:271
 msgid "Event time is before MIDI source position"
-msgstr ""
+msgstr "Čas události je před polohou zdroje MIDI"
 
 #: smf_source.cc:306 smf_source.cc:345
 msgid "Skipping event with unordered time %1"
-msgstr ""
+msgstr "Přeskakuje se událost s neuspořádaným časem %1"
 
 #: smf_source.cc:410
 msgid "cannot open MIDI file %1 for write"
@@ -2374,7 +2377,7 @@ msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 "Pokus o zápis zvukového zdrojového souboru chráněného proti zápisu (%1)"
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "Chyba v programování: %1 %2"
 
@@ -2639,11 +2642,11 @@ msgstr "M-Clock"
 msgid "LTC"
 msgstr "LTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr "Chyba v programování: neznámý nativní formát hlavičky: %1"
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr "Nelze otevřít adresář %1 (%2)"
 

libs/ardour/po/de.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-17 11:09+0200\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2013-07-23 15:04+0200\n"
 "Last-Translator: Edgar Aichinger <edogawa@aon.at>\n"
 "Language-Team: German <ardour-dev@lists.ardour.org>\n"
@@ -31,58 +31,58 @@ msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 "AudioDiskstream %1: es gibt keine Wiedergabeliste, die kopiert werden kann!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: Kann während des Befüllens %2 nicht aus Wiedergabeliste "
 "bei Frame %3 lesen"
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: Kann %2 nicht aus Wiedergabeliste bei Frame %3 lesen"
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "AudioDiskstream %1: Kann nicht auf Disk schreiben"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "AudioDiskstream %1: Kann aufgenommene Daten nicht auf Disk schreiben!"
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: konnte keine Region für die komplette Audiodatei erzeugen"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 "AudioDiskstream: konnte keine Region für das aufgenommene Audiomaterial "
 "erzeugen!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "Programmierfehler: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "AudioDiskstream: Kanal %1 Bereichsüberschreitung"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1:%2 neue Aufnahmedatei nicht korrekt initialisiert"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "%1: kann vorläufige Aufnahme-Quelldatei %2 nicht wiederherstellen"
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 "%1: Liste enthält falsche Anzahl vorläufiger Quellen - alle werden ignoriert"
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 "%1: kann aus vorläufigen Aufnahmequellen keine Region für die komplette "
@@ -136,7 +136,7 @@ msgstr "Audio-Wiedergabelisten (unbenutzt)"
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -316,8 +316,8 @@ msgstr "AudioSource: kann Pfad für Peaks (b) \"%1\" nicht öffnen (%2)"
 msgid ""
 "AudioSource[%1]: peak read - cannot read %2 samples at offset %3 of %4 (%5)"
 msgstr ""
-"AudioSource[%1]: peak read - kann %2 Samples bei Offset %3 von %4 nicht "
+"AudioSource[%1]: peak read - kann %2 Samples bei Offset %3 von %4 nicht lesen"
-"lesen(%5)"
+"(%5)"
 
 #: audiosource.cc:667
 msgid "%1: could not write read raw data for peak computation (%2)"
@@ -582,7 +582,7 @@ msgstr "Dreieck"
 msgid "Rectangular"
 msgstr "Rechteck"
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr "Kein"
 
@@ -800,24 +800,24 @@ msgstr "kann momentanes Arbeitsverzeichnis nicht bestimmen (%1)"
 msgid "unknown file type for session %1"
 msgstr "Unbekannter Dateityp für Projekt %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 "Konnte die Systemgrenze für offene Dateien nicht auf \"unbeschränkt\" setzen"
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr "Konnte die Systemgrenze für offene Dateien nicht auf %1 setzen"
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr "Ihre Systemkonfiguration beschränkt %1 auf nur %2 offene Dateien"
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr "Konnte die Grenze für offene Dateien nicht erhalten (%1)"
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr "Lade Konfiguration"
 
@@ -1063,7 +1063,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr "unkorrekter XML-Modus an Locations::set_state weitergereicht"
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr "Projekt"
 
@@ -1149,25 +1149,25 @@ msgstr "MidiDiskstream: Wiedergabeliste \"%1\" ist keine MIDI-Wiedergabeliste"
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "MidiDiskstream %1: es gibt keine Wiedergabeliste zum Kopieren!"
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 "MidiDiskstream %1: kann %2 nicht von Wiedergabeliste bei Frame %3 lesen"
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "MidiDiskstream %1: kann nicht auf Disk schreiben"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 "MidiDiskstream \"%1\": kann aufgenommene Daten nicht auf Disk schreiben!"
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr "%1: konnte Region für die komplette MIDI-Datei nicht erzeugen"
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr "MidiDiskstream: konnte Region für aufgenommenes MIDI nicht erzeugen"
 
@@ -1384,23 +1384,23 @@ msgstr ""
 "Das Speichern von Pluginpresets werden in diesem %1-Binärpaket nicht "
 "unterstützt. Erwägen Sie, für die Vollversion zu bezahlen"
 
-#: plugin_insert.cc:599
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "Programmierfehler:"
 
-#: plugin_insert.cc:914
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr "Dem XML-Knoten zur Beschreibung des Plugins fehlt das \"type\"-Feld"
 
-#: plugin_insert.cc:929
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr "Unbekannter Plugintyp %1 im Einfüge-Status des Plugins"
 
-#: plugin_insert.cc:957
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr "Das Plugin hat kein Feld für die eindeutige ID"
 
-#: plugin_insert.cc:966
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1408,15 +1408,15 @@ msgstr ""
 "Referenz auf ein unbekanntes Plugin (\"%1\") gefunden.\n"
 "Vielleicht wurde es seit der letzten Verwendung entfernt oder verschoben."
 
-#: plugin_insert.cc:1082
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr "PluginInsert: Auto: keine LADSPA Portnummer"
 
-#: plugin_insert.cc:1089
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr "PluginInsert: Auto: Port-ID Bereichsüberschreitung"
 
-#: plugin_insert.cc:1125
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 "PluginInsert: automatisierbares Kontrollelement %1 nicht gefunden - ignoriert"
@@ -1566,23 +1566,23 @@ msgstr "Import: Fehler in src_new() : %1"
 msgid "return %1"
 msgstr "Rückgabewert: %1"
 
-#: route.cc:1101 route.cc:2557
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr "unbekannter Prozessortyp \"%1\"; ignoriert"
 
-#: route.cc:1113
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr "Prozessor konnte nicht erzeugt werden. Ignoriert."
 
-#: route.cc:1986 route.cc:2210
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr "Schlechter Knoten an Route::set_state() gesendet [%1]"
 
-#: route.cc:2045
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr "Pannerziel-Status für Route (%1) ohne Panner gefunden!"
 
-#: route.cc:2113 route.cc:2117 route.cc:2324 route.cc:2328
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 "schlecht geformte Zeichenkette für den Schlüssel der Sortierreihenfolge in "
@@ -1853,7 +1853,7 @@ msgstr "%1: kann für Export nicht Dateiposition %2 aufsuchen"
 msgid "Export ended unexpectedly: %1"
 msgstr "Export endet unerwartet: %1"
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
@@ -1861,11 +1861,11 @@ msgstr ""
 "LTC-Kodierer: ungültige Framerate - das Kodieren von LTC wird für den "
 "restlichen Teil dieses Projekts ausgesetzt."
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr "Session: konnte vollständigen MIDI-Timecode nicht senden"
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr "Session: kann quarter-frame MTC-Nachricht nicht senden (%1)"
 
@@ -2262,7 +2262,7 @@ msgstr "Unbekannter JACK-Transportstatus im Sync-Callback"
 msgid "Cannot loop - no loop range defined"
 msgstr "Kann nicht loopen - kein Schleifenbereich definieert"
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
@@ -2271,7 +2271,7 @@ msgstr ""
 "benutzt.\n"
 "Ändern Sie die Konfigurationsoption"
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"

libs/ardour/po/el.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour 0.664.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2007-04-16 00:38+0200\n"
 "Last-Translator: Klearchos Gourgourinis <muadib@in.gr>\n"
 "Language-Team: Hellenic(Greek)\n"
@@ -29,59 +29,59 @@ msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 "AudioDiskstream %1: δεν υπάρχει λίστα αναπαρ/γής για να γίνει αντιγραφή!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: κατα την αναγόμωση, δεν μπόρεσα να διαβάσω %2 από τη "
 "λίστα αναπαρ/γής στο frame %3"
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: δεν μπόρεσα να διαβάσω %2 από τη λίστα αναπαρ/γής στο "
 "frame %3"
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "AudioDiskstream %1: δεν μπορώ να γράψω στο δίσκο"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 "AudioDiskstream \"%1\": αδύνατη η εκκαθάριση δειγματοληπτικών δεδομένων στο "
 "δίσκο!"
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: δεν μπόρεσα να δημιουργήσω περιοχή για ολόκληρο audio file"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 "AudioDiskstream: δεν μπόρεσα να δημιουργήσω περιοχή για δειγματοληψίες!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "σφάλμα προγραμματιστή: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "AudioDiskstream: κανάλι %1 εκτός διαστήματος"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1:%2 νέα δειγματοληψία δεν εκκινήθη σωστά"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "%1: δεν μπορώ να ανοίξω το αρχείο %2 από την απαιτούμενη πηγή"
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr "%1: ετυπώθη λανθασμένος αριθμός απαιτούμενων πηγών - αγνοήθηκαν όλες"
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 "%1: αδύνατη η δημιουργία ακέραιας περιοχής από τις απαιτούμενες πηγές "
@@ -131,7 +131,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -212,49 +212,49 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr ""
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 #, fuzzy
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "IO: δεν μπορεί να καταχώρηθεί η θύρα εισόδου %1"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr ""
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr "η σύνδεση εκλήθη πριν να εκκινηθεί η engine"
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "AudioEngine: αδύνατη η σύνδεση %1 (%2) σε %3 (%4)"
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr "η αποσύνδεση εκλήθη πριν να εκκινηθεί η engine"
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 #, fuzzy
 msgid "get_port_by_name() called before engine was started"
 msgstr "η ρουτίνα get_port_by_name() εκλήθη πριν να εκκινηθεί η engine"
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr "η ρουτίνα get_ports εκλήθη πριν να εκκινηθεί η engine"
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "Αποτυχία συνδέσεως με τον JACK"
 
@@ -574,7 +574,7 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -796,25 +796,25 @@ msgstr "δεν μπορώ να καθορίσω τον τρέχοντα ενερ
 msgid "unknown file type for session %1"
 msgstr "άγνωστος τύπος αρχείου για την συνεδρία %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 #, fuzzy
 msgid "Could not set system open files limit to %1"
 msgstr "αδύνατη η επαναφορά του state file από backup %1"
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 #, fuzzy
 msgid "Could not get system open files limit (%1)"
 msgstr "%1: δεν μπόρεσα να γράψω δεδομένα του αρχείου peak (%2)"
 
-#: globals.cc:267
+#: globals.cc:266
 #, fuzzy
 msgid "Loading configuration"
 msgstr "Ανάκληση αρχείου ρυθμίσεων χρήστη %1"
@@ -975,21 +975,21 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr "LADSPA: το module δεν έχει ενδεικτική λειτουργία."
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr "LADSPA: το plugin την 'κοπάνισε' μετά την ανακάλυψη του!"
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 "LADSPA: \"%1\" δεν μπορεί να χρησιμοποιηθεί, εφ'όσον δεν μπορεί να κάνει επι "
 "τόπου επεξεργασία"
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 #, fuzzy
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
@@ -999,36 +999,36 @@ msgstr ""
 "ενδείκνυται αλλαγή στο σχεδιασμό του plugin, και οι ρυθμίσεις ίσως να είναι "
 "άκυρες"
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr "Κακός κόμβος εστάλη στο LadspaPlugin::set_state"
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr "LADSPA: κανείς αριθμός θύρας ladspa"
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr "LADSPA: κανένα δεδομένο θύρας ladspa"
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADSPA: δεν μπορώ να φορτώσω module από \"%1\""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 #, fuzzy
 msgid "Could not locate HOME.  Preset not removed."
 msgstr "Δεν μπόρεσα να βρώ το HOME.  Προ-ρύθμιση δεν αποθηκεύθηκε."
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "Δεν μπόρεσα να δημιουργήσω το %1.  Προ-ρύθμιση δεν αποθηκεύθηκε. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr "Σφάλμα στην αποθήκευση αρχείου προ-ρυθμίσεων %1."
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "Δεν μπόρεσα να βρώ το HOME.  Προ-ρύθμιση δεν αποθηκεύθηκε."
 
@@ -1071,7 +1071,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr "λανθασμένο XML mode πέρασε στις Τοποθεσίες::set_state"
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr ""
 
@@ -1146,31 +1146,31 @@ msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 "AudioDiskstream %1: δεν υπάρχει λίστα αναπαρ/γής για να γίνει αντιγραφή!"
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 #, fuzzy
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: δεν μπόρεσα να διαβάσω %2 από τη λίστα αναπαρ/γής στο "
 "frame %3"
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 #, fuzzy
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "AudioDiskstream %1: δεν μπορώ να γράψω στο δίσκο"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 #, fuzzy
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 "AudioDiskstream \"%1\": αδύνατη η εκκαθάριση δειγματοληπτικών δεδομένων στο "
 "δίσκο!"
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 #, fuzzy
 msgid "%1: could not create region for complete midi file"
 msgstr "%1: δεν μπόρεσα να δημιουργήσω περιοχή για ολόκληρο audio file"
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 #, fuzzy
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
@@ -1385,24 +1385,36 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "σφάλμα προγραμματισμού: "
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 #, fuzzy
 msgid "XML node describing plugin is missing the `type' field"
 msgstr "Στον κόμβο XML που περιγράφει το insert λείπει το πεδίο `type'"
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr "άγνωστος τύπος plugin %1 στην κατάσταση εισαχθέντων plugins"
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1410,15 +1422,15 @@ msgstr ""
 "Ευρέθη μια αναφορά σε plugin (\"%1\") που είναι άγνωστο.\n"
 "Ίσως έχει διαγραφεί ή μετακινηθεί από την τελευταία του χρήση."
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr "PluginInsert: Auto: χωρίς αριθμό θύρας ladspa"
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr "PluginInsert: Auto: το id θύρας είναι εκτός πεδίου"
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 #, fuzzy
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr "αβέβαιο συμβάν αυτοματισμού ευρέθηκε (και αγνοήθηκε)"
@@ -1577,25 +1589,25 @@ msgstr "Εισαγωγή: src_new() απέτυχε : %1"
 msgid "return %1"
 msgstr ""
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 #, fuzzy
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr "άγνωστος τύπος Λήψης(Insert) \"%1\"... αγνοήθηκε"
 
-#: route.cc:1112
+#: route.cc:1117
 #, fuzzy
 msgid "processor could not be created. Ignored."
 msgstr "εισαγωγή δεν μπόρεσε να δημιουργηθεί. Αγνοήθηκε."
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr "Κακός κόμβος εστάλη στο Route::set_state() [%1]"
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 "δύσμορφη γραμμή κλειδιού ταξινομήσεως στο αρχείο καταστάσεως ! [%1] ... "
@@ -1865,17 +1877,17 @@ msgstr "%1: δεν μπορώ να αναζητήσω στο %2 για εξαγ
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr "Συνεδρία: δεν μπόρεσα να στείλω ολόκληρο MIDI time code"
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr "Συνεδρία: δεν μπορώ να στείλω τέταρτο-frame MTC μήνυμα (%1)"
 
@@ -1883,11 +1895,11 @@ msgstr "Συνεδρία: δεν μπορώ να στείλω τέταρτο-fra
 msgid "Session: cannot create Playlist from XML description."
 msgstr "Συνεδρία: δεν μπορώ να δημιουργήσω την Playlist από την XML περιγραφή."
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr "Συνεδρία: σφάλμα στο no roll για %1"
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 "Σφάλμα προγραμματισμού: παράνομος τύπος συμβάντος στο process_event (%1)"
@@ -2303,7 +2315,7 @@ msgstr "Άγνωστη κατάσταση του JACK transport %1 στην αν
 msgid "Cannot loop - no loop range defined"
 msgstr "Δεν γίνεται loop - κανένα διάστημα loop δεν προσδιορίστηκε"
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 #, fuzzy
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
@@ -2313,7 +2325,7 @@ msgstr ""
 "transport.\n"
 "Συνιστούμε την αλλαγή των διαμορφωμένων ρυθμίσεων"
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 #, fuzzy
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
@@ -2468,7 +2480,7 @@ msgstr "SndFileSource: δεν μπορούσα να αναζητήσω στο fr
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "σφάλμα προγραμματισμού: %1 %2"
 
@@ -2730,12 +2742,12 @@ msgstr ""
 msgid "LTC"
 msgstr ""
 
-#: utils.cc:589
+#: utils.cc:599
 #, fuzzy
 msgid "programming error: unknown native header format: %1"
 msgstr "σφάλμα προγραμματισμού: άγνωστος τύπος Redirect εδημιουργήθη!"
 
-#: utils.cc:604
+#: utils.cc:614
 #, fuzzy
 msgid "cannot open directory %1 (%2)"
 msgstr "δεν μπορώ να ανοίξω το πρόσφατο αρχείο συνεδρίας %1 (%2)"

libs/ardour/po/es.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Pablo Fernández <pablo.fbus@gmail.com>\n"
 "Language-Team: Grupo de Traducción al Español <traductores@teklibre.com>\n"
@@ -32,57 +32,57 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "AudioDiskstream %1: ¡No hay ninguna lista de reproducción para copiar!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: al rellenar, no se puede leer %2 de la lista de "
 "reproducción en el cuadro %3."
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: no se puede leer %2 de la lista de reproducción en el "
 "cuadro %3."
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "AudioDiskstream %1: no se puede escribir en el disco."
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: no se pudo crear la región para el archivo de audio completo"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr "AudioDiskstream: ¡No se pudo crear región para el audio capturado!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "error de programador: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "AudioDiskstream: canal %1 fuera de rango"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1:%2 archivo de captura nuevo no inicializado correctamente"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "%1: no se puede restaurar el archivo de captura pendiente %2"
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 "%1: cantidad listada de fuentes pendientes incorrecta - se ignorarán todas"
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 "%1: no se puede crear la región del archivo entero desde las fuentes de "
@@ -130,7 +130,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -210,7 +210,7 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr "Conectar sesión al motor"
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
@@ -218,7 +218,7 @@ msgstr ""
 "ya existe un puerto con el nombre \"%1\": compruebe si hay nombres de pistas/"
 "buses duplicados"
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
@@ -226,35 +226,35 @@ msgstr ""
 "JACK no dispone de más puertos. Debes salir de %1 y reiniciar JACK con más "
 "puertos si necesitas tantas pistas."
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "AudioEngine: no se puede registrar el puerto \"%1\": %2"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr "Incapaz de crear puerto: %1"
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr "conexión invocada antes de que se inicie el motor"
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "AudioEngine: no se puede conectar %1 (%2) a %3 (%4)"
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr "desconexión invocada antes de que se inicie el motor"
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr "get_port_by_name() invocada antes de que se inicie el motor"
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr "get_ports invocada antes de que se inicie el motor"
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "falló la conexión a JACK"
 
@@ -568,7 +568,7 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -776,23 +776,23 @@ msgstr ""
 msgid "unknown file type for session %1"
 msgstr "tipo de archivo desconocido para la sesión %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr "No se pudo establecer el límite de archivos abiertos a \"unlimited\""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr "No se pudo establecer el límite de archivos abiertos a \"unlimited\""
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr "No se pudo obtener el límite de archivos abiertos del sistema (%1) "
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr "Cargando configuración"
 
@@ -944,53 +944,53 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr ""
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr ""
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr ""
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr ""
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr ""
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr ""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr ""
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "No se pudo crear %1. El preset no se guardó. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr "Error al guardar el archivo de preset %1."
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr ""
 
@@ -1030,7 +1030,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr "sesión"
 
@@ -1107,23 +1107,23 @@ msgstr ""
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr ""
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 
@@ -1317,23 +1317,35 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "error de programación:"
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr ""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr "Tipo de plugin desconocido %1 en estado de inserción de plugins"
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr "El plugin no tiene un campo de ID único."
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1341,15 +1353,15 @@ msgstr ""
 "Se encontró una referencia a un plugin (\"%1\") que no se conoce.\n"
 "Quizás se suprimió o se movió desde la última vez que fue usado."
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1494,23 +1506,23 @@ msgstr ""
 msgid "return %1"
 msgstr "retorno %1"
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr ""
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr ""
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr ""
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1763,17 +1775,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1781,11 +1793,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr ""
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2141,13 +2153,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr "No se puede reproducir en bucle - no se definió un rango de bucle."
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2290,7 +2302,7 @@ msgstr ""
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "error de programación: %1 %2"
 
@@ -2536,11 +2548,11 @@ msgstr ""
 msgid "LTC"
 msgstr "LTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr ""
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr ""
 

libs/ardour/po/it.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour 0.664.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2003-05-21 12:50+0500\n"
 "Last-Translator: Filippo Pappalardo <filippo@email.it>\n"
 "Language-Team: Italian\n"
@@ -29,60 +29,60 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "DiskStream %1: non esiste alcuna playlist di cui fare una copia!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 #, fuzzy
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr "DiskStream %1: impossibile leggere %2 dalla playlista al frame %3"
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 #, fuzzy
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "DiskStream %1: impossibile leggere %2 dalla playlista al frame %3"
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 #, fuzzy
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "DiskStream %1: impossibile scrivere sul disco"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 #, fuzzy
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "DiskStream \"%1\": impossibile scaricare i dati acquisiti sul disco!"
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: impossibile creare una regione per il file audio completo"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 #, fuzzy
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr "DiskStream: impossibile creare una regione per l'audio registrato!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 #, fuzzy
 msgid "programmer error: %1"
 msgstr "errore di programmazione: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 #, fuzzy
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "DiskStream: canale fuori margine"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1:%2 nuovo file di registrazione non è stato avviato correttamente"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 #, fuzzy
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "Import: impossibile aprire il file audio di input \"%1\""
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 #, fuzzy
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr "Playlist: impossibile creare la Regione dal file di stato"
@@ -131,7 +131,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -209,51 +209,51 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr ""
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 #, fuzzy
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "IO: impossibile registrare la porta %1"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr ""
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr "richiesta di connessione avvenuta prima dell'avvio dell'applicazione"
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr ""
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr ""
 "richiesta di disconnessione avvenuta prima dell'avvio dell'applicazione"
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 #, fuzzy
 msgid "get_port_by_name() called before engine was started"
 msgstr ""
 "richiesta get_port_by_name() avvenuta prima dell'avvio dell'applicazione"
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr "richiesta di get_ports avvenuta prima dell'avvio dell'applicazione"
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr ""
 
@@ -572,7 +572,7 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -797,25 +797,25 @@ msgstr "impossibile determinare la cartella di lavoro corrente (%1)"
 msgid "unknown file type for session %1"
 msgstr "tipo di fle sconosciuto per la sessione %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 #, fuzzy
 msgid "Could not set system open files limit to %1"
 msgstr "Esportazione: impossibile scrivere dati sul file di output (%1)"
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 #, fuzzy
 msgid "Could not get system open files limit (%1)"
 msgstr "IO: impossibile registrare la porta %1"
 
-#: globals.cc:267
+#: globals.cc:266
 #, fuzzy
 msgid "Loading configuration"
 msgstr "Ardour: impossibile la lettura del file di configurazione \"%1\""
@@ -972,54 +972,54 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr "LADSPA: il modulo non ha alcuna funzione descriptor."
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr "LADSPA: il plugin è stato rimosso"
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr ""
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr ""
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr ""
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADPSA: impossibile caricare il modulo da \"%1\""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 #, fuzzy
 msgid "Could not locate HOME.  Preset not removed."
 msgstr "impossibile localizzare HOME.  Preset non salvato."
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "Impossibile creare %1 . Preset non salvato. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr "Errore nel salvare il file di preset %1."
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "impossibile localizzare HOME.  Preset non salvato."
 
@@ -1060,7 +1060,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr ""
 
@@ -1134,27 +1134,27 @@ msgstr "DiskStream %1: impossibile leggere %2 dalla playlista al frame %3"
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "DiskStream %1: non esiste alcuna playlist di cui fare una copia!"
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 #, fuzzy
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "DiskStream %1: impossibile leggere %2 dalla playlista al frame %3"
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 #, fuzzy
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "DiskStream %1: impossibile scrivere sul disco"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 #, fuzzy
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "DiskStream \"%1\": impossibile scaricare i dati acquisiti sul disco!"
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 #, fuzzy
 msgid "%1: could not create region for complete midi file"
 msgstr "%1: impossibile creare una regione per il file audio completo"
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 #, fuzzy
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr "DiskStream: impossibile creare una regione per l'audio registrato!"
@@ -1360,24 +1360,36 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "errore di programmazione: "
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 #, fuzzy
 msgid "XML node describing plugin is missing the `type' field"
 msgstr "Il nodo XML descrivente l'insert manca del campo `type'"
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr ""
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1385,15 +1397,15 @@ msgstr ""
 "Trovato un riferimento ad un plugin (\"%1\") sconosciuto.\n"
 "Forse  stato rimosso o spostato dall'ultima volta che lo si e' usato"
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1551,25 +1563,25 @@ msgstr ""
 msgid "return %1"
 msgstr ""
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 #, fuzzy
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr "impossibile creare la cartella per la sessione %1; ignorato"
 
-#: route.cc:1112
+#: route.cc:1117
 #, fuzzy
 msgid "processor could not be created. Ignored."
 msgstr "Sessione: impossibile creare un nuovo route"
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr ""
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1834,17 +1846,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1852,11 +1864,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr "Sessione: impossibile creare Playlist dalla descrizione XML"
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2271,13 +2283,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr ""
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2426,7 +2438,7 @@ msgstr "FileSource: impossibile aprire \"%1\": (%2)"
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 #, fuzzy
 msgid "programming error: %1 %2"
 msgstr "errore di programmazione: %1"
@@ -2681,11 +2693,11 @@ msgstr ""
 msgid "LTC"
 msgstr ""
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr ""
 
-#: utils.cc:604
+#: utils.cc:614
 #, fuzzy
 msgid "cannot open directory %1 (%2)"
 msgstr "impossibile accedere al file di sessione recente %1 (%2)"

libs/ardour/po/nn.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2011-09-13 22:43+0100\n"
 "Last-Translator: Eivind Ødegård <meinmycell-lists@yahoo.no>\n"
 "Language-Team: Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -32,54 +32,54 @@ msgstr "Lyd-diskstraum: Spelelista \"%1\" er ikkje ei lydspeleliste"
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "Lyd-diskstraum %1: det finst inga speleliste å kopiera!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 "Lyd-diskstraum %1: greidde ikkje lesa %2 frå spelelista, ramme %3, ved "
 "attfylling"
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "Lyd-diskstraum %1: greidde ikkje lesa %2 frå spelelista, ramme %3"
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "Lyd-diskstraum %1: greidde ikkje skriva til disk"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "Lyd-diskstraum \"%1\": greier ikkje skriva opptaket til disken!"
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: greidde ikkje laga bolk for heil lydfil"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr "Lyd-diskstraum: greidde ikkje laga bolk frå opptaket!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "Programmerarfeil: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "Lyd-diskstraum: kanal %1 utanfor rekkjevidd"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1: ny opptaksfil %2 vart ikkje påbyrja rett"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "%1: greidde ikkje henta fram att den ventande opptakskjeldefila %2"
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr "%1: feil tal på ventande kjelder på lista - ser bort frå alle"
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr "%1: greidde ikkje laga heilfilbolk frå ventande opptakskjelder"
 
@@ -125,7 +125,7 @@ msgstr "Lydspelelister (ubrukte)"
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr "Kople økta til maskin"
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
@@ -215,7 +215,7 @@ msgstr ""
 "ein port med namnet \"%1\" finst frå før: sjekk opp dublettar i namn på spor "
 "eller bussar"
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 #, fuzzy
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
@@ -224,35 +224,35 @@ msgstr ""
 "Det finst ikkje fleire JACK-portar. Du må stoppa %1 og starta JACK på nytt "
 "med nok portar viss du treng så mange spor."
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "AudioEngine: greier ikkje registrera porten \"%1\": %2"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr "greidde ikkje laga port: %1"
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr "tilkoplinga vart oppkalla frø tenaren starta"
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "Lydmaskineri: Klarte ikkje kopla %1 (%2) til %3 (%4)."
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr "fråkoplinga vart oppkalla før tenaren starta"
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr "get_port_by_name() vart oppkalla før tenaren starta"
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr "get_ports vart oppkalla før tenaren starta"
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "greidde ikkje kopla til JACK"
 
@@ -577,7 +577,7 @@ msgstr "Trekant"
 msgid "Rectangular"
 msgstr "Firkant"
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr "Ingen"
 
@@ -795,23 +795,23 @@ msgstr "greier ikkje avgjera kva som er arbeidsmappa no (%1)"
 msgid "unknown file type for session %1"
 msgstr "ukjend filtype for økta %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr "Greidde ikkje setja systemgrensa for opne filer til \"uavgrensa\""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr "Greidde ikkje setja grensa for opne systemfiler til %1"
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr "Greidde ikkje få tak i grensa for opne systemfiler (%1)"
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr "Lastar oppsettet"
 
@@ -966,20 +966,20 @@ msgstr "H"
 msgid "%d"
 msgstr "%d"
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr "LADSPA: modulen har ingen skildringsfunksjon"
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr "LADSPA: tilleggsprogrammet har vorte borte sidan det vart oppdaga!"
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 "LADSPA: kan ikkje bruka \"%1\", sidan han ikkje kan prosessera på staden"
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 #, fuzzy
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
@@ -989,35 +989,35 @@ msgstr ""
 "tyda på feil i korleis tilleggsprogrammet er utforma, og at eventuelle "
 "ferdigprogram kan vera ugyldige."
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr "Feil punkt sendt til LadspaPlugin::set_state"
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr "LADSPA: ikkje noko Ladspa-portnummer"
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr "LADSPA: ingen portdata"
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADSPA: greier ikkje lasta modul frå \"%1\""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr "Greidde ikkje finna heimemappa. Har ikkje fjera ferdigoppsett."
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "Greidde ikkje laga %1. Har ikkje lagra ferdigoppsett. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr "Feil med å lagra ferdigoppsettfila %1."
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "Greidde ikkje finna heimemappa. Har ikkje lagra ferdigoppsett."
 
@@ -1057,7 +1057,7 @@ msgstr "Stader: forsøk på å bruka ukjend stad som vald stad"
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr "feil XML-modus send til Locations::set_state"
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr "økt"
 
@@ -1140,23 +1140,23 @@ msgstr "MIDI-diskstraum: Spelelista \"%1\" er ikkje ei midispeleliste"
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "MIDI-diskstraum %1: det finst inga speleliste å kopiera!"
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "MIDI-diskstraum %1: greidde ikkje lesa %2 frå spelelista, ramme %3"
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "MIDI-diskstraum %1: greidde ikkje skriva til disk"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "MIDI-diskstraum \"%1\": greier ikkje skriva opptaket til disken!"
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr "%1: greidde ikkje laga bolk for heil midifil"
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr "MIDI-diskstraum: greidde ikkje laga bolk frå midi-opptaket!"
 
@@ -1355,23 +1355,41 @@ msgstr "Fann ingen speleliste-ID i PlaylistSource-XML!"
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr "Greidde ikkje byggja speleliste for PlaylistSource frå øktdata!"
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+#, fuzzy
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+"Du kan ikkje lagra førehandsoppsett for AudioUnit i denne versjonen av "
+"Ardour. Du bør vurdera å betala for ein nyare verjson"
+
+#: plugin.cc:398
+#, fuzzy
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+"Du kan ikkje lagra AudioUnit-innstillingar i denne versjonen av Ardour. Du "
+"bør vurdera å betala for ein nyare verjson"
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "programmeringsfeil: "
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr "XML-punktet som skildrar utvidinga manglar 'type'-feltet"
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr "ukjent programtilleggstype %1 i innpluggingstilstanden"
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr "Innstikket har ikkje noko eige ID-felt"
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1379,15 +1397,15 @@ msgstr ""
 "Fann ein referanse til det ukjende tilleggsprogrammet \"%1\".\n"
 "Kanskje det har vorte fjerna eller flytt sidan sist det vart brukt."
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr "PluginInsert:Auto: ikkje noko ladspa-portnummer"
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr "PluginInsert: Auto: port-id utanfor rekkjevidd"
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 "PluginInsert: fann ikkje den automasjonsferdige kontrollen %1, såg bort frå "
@@ -1541,23 +1559,23 @@ msgstr "Import: src_new()-funkjsonen lukkast ikkje: %1"
 msgid "return %1"
 msgstr "retur %1"
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr "\"%1\" er ein ukjend prosesseringstype, hoppa over"
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr "greidde ikkje laga prosessering. Hoppa over."
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr "Feil punkt sendt til Route::set_state()-funksjonen [%1]"
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr "Fann panoreringsstatus for ruta (%1) utan panorering!"
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr "feilforma tingingsnykjelstreng i tilstandsfil! [%1] ... hoppa over."
 
@@ -1821,17 +1839,17 @@ msgstr "%1: greier ikkje finna %2 for eksportering"
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr "Økt: greidde ikke senda full MIDI-tidskode"
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr "Økt: greidde ikkje senda kvartramme-MTC-melding (%1)"
 
@@ -1839,11 +1857,11 @@ msgstr "Økt: greidde ikkje senda kvartramme-MTC-melding (%1)"
 msgid "Session: cannot create Playlist from XML description."
 msgstr "Økt: greier ikkje laga speleliste ut frå XML-skildringa."
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr "Økt: feil på ingen rull for %1"
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr "Programmeringsfeil: ulovleg handlingstype i process-event (%1)"
 
@@ -2225,7 +2243,7 @@ msgstr "Ukjend JACK-transporttilstand %1 i synk-tilbakekallet"
 msgid "Cannot loop - no loop range defined"
 msgstr "Greidde ikkje spela i lykkje - du har ikkje gjeve noko lykkjeområde"
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
@@ -2233,7 +2251,7 @@ msgstr ""
 "Samanhengande lykkjespeling er ikkje støtta når %1 bruker JACK-transporten.\n"
 "Me rår til at du endrar innstillingane."
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2384,7 +2402,7 @@ msgstr "SndFileSource: @ %1 greidde ikkje lesa %2 i %3 (%4) (len = %5)"
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr "prøvde å skriva til ei ikkje-skrivbar lydkjeldefil (%1)"
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "programmeringsfeil: %1 %2"
 
@@ -2650,11 +2668,11 @@ msgstr "MIDI-klokke"
 msgid "LTC"
 msgstr "MTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr "programmeringsfeil: ukjent opphavleg hovudformat: \"%1\""
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr "greier ikkje opna mappa %1 (%2)"
 
@@ -3267,13 +3285,6 @@ msgstr "greier ikkje opna mappa %1 (%2)"
 #~ msgid "AUPlugin: render callback called illegally!"
 #~ msgstr "AUPlugin: oppteiknings-tilbakekall påkalla ulovleg!"
 
-#~ msgid ""
-#~ "Saving AudioUnit settings is not supported in this build of Ardour. "
-#~ "Consider paying for a newer version"
-#~ msgstr ""
-#~ "Du kan ikkje lagra AudioUnit-innstillingar i denne versjonen av Ardour. "
-#~ "Du bør vurdera å betala for ein nyare verjson"
-
 #~ msgid "Bad node sent to AUPlugin::set_state"
 #~ msgstr "Feil punkt sendt til AUPlugin::set_state"
 
@@ -3297,13 +3308,6 @@ msgstr "greier ikkje opna mappa %1 (%2)"
 #~ msgid "Saving plugin state to %1 failed"
 #~ msgstr "Greidde ikkje lagra innstikkstatus til %1"
 
-#~ msgid ""
-#~ "Saving AudioUnit presets is not supported in this build of Ardour. "
-#~ "Consider paying for a newer version"
-#~ msgstr ""
-#~ "Du kan ikkje lagra førehandsoppsett for AudioUnit i denne versjonen av "
-#~ "Ardour. Du bør vurdera å betala for ein nyare verjson"
-
 #~ msgid "Discovering AudioUnit plugins (could take some time ...)"
 #~ msgstr "Finn AudioUnit-innstikk (dette kan ta litt tid...)"
 

libs/ardour/po/pl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2008-04-10 10:51+0100\n"
 "Last-Translator: Piotr Zaryk <pzaryk@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -28,52 +28,52 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr ""
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "błąd programisty: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr ""
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr ""
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr ""
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 
@@ -119,7 +119,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -195,47 +195,47 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr ""
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr ""
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr ""
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr ""
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "nie udało się połączyć z JACK"
 
@@ -532,7 +532,7 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -739,23 +739,23 @@ msgstr ""
 msgid "unknown file type for session %1"
 msgstr ""
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr ""
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr ""
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr ""
 
@@ -907,53 +907,53 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr ""
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr ""
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr ""
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr ""
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr ""
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr ""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr ""
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr ""
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr ""
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr ""
 
@@ -993,7 +993,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr ""
 
@@ -1065,23 +1065,23 @@ msgstr ""
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr ""
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 
@@ -1280,37 +1280,49 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr ""
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr ""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr ""
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
 msgstr ""
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1450,23 +1462,23 @@ msgstr ""
 msgid "return %1"
 msgstr ""
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr ""
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr ""
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr ""
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1720,17 +1732,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1738,11 +1750,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr ""
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2110,13 +2122,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr ""
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2262,7 +2274,7 @@ msgstr ""
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr ""
 
@@ -2512,11 +2524,11 @@ msgstr ""
 msgid "LTC"
 msgstr "MTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr ""
 
-#: utils.cc:604
+#: utils.cc:614
 #, fuzzy
 msgid "cannot open directory %1 (%2)"
 msgstr "nie można otworzyć pliku dźwiękowego metronomu %1 (%2)"

libs/ardour/po/ru.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 03:23+0400\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2013-06-14 02:14+0300\n"
 "Last-Translator: Александр Прокудин <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: русский <>\n"
@@ -32,52 +32,52 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr ""
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr ""
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr ""
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr ""
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr ""
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 
@@ -123,7 +123,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -203,47 +203,47 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr ""
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "AudioEngine: cannot register port \"%1\": %2"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr ""
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr ""
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr ""
 
@@ -541,7 +541,7 @@ msgstr "Треугольное"
 msgid "Rectangular"
 msgstr "Прямоугольное"
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr "Нет"
 
@@ -746,23 +746,23 @@ msgstr ""
 msgid "unknown file type for session %1"
 msgstr ""
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr ""
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr ""
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr ""
 
@@ -914,53 +914,53 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr ""
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr ""
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr ""
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr ""
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr ""
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr ""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr ""
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr ""
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr ""
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr ""
 
@@ -1000,7 +1000,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr ""
 
@@ -1076,23 +1076,23 @@ msgstr ""
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr ""
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 
@@ -1286,37 +1286,49 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "ошибка программы: "
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr ""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr ""
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
 msgstr ""
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1459,23 +1471,23 @@ msgstr ""
 msgid "return %1"
 msgstr ""
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr ""
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr ""
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr ""
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1728,17 +1740,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1746,11 +1758,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr ""
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2103,13 +2115,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr ""
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2253,7 +2265,7 @@ msgstr ""
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "programming error: %1 %2"
 
@@ -2499,11 +2511,11 @@ msgstr ""
 msgid "LTC"
 msgstr "LTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr "programming error: unknown native header format: %1"
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr "cannot open directory %1 (%2)"
 

libs/ardour/po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ardour\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2006-10-03 01:09+GMT+1\n"
 "Last-Translator: Petter Sundlöf <petter.sundlof@findus.dhs.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -28,52 +28,52 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr ""
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr ""
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr ""
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr ""
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr ""
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 
@@ -119,7 +119,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -198,48 +198,48 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr "Ansluter till ljudmotorn"
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 #, fuzzy
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "AudioEngine: kan inte ansluta %1 (%2) till %3 (%4)"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr ""
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "AudioEngine: kan inte ansluta %1 (%2) till %3 (%4)"
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr ""
 
@@ -537,7 +537,7 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -744,23 +744,23 @@ msgstr ""
 msgid "unknown file type for session %1"
 msgstr ""
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr ""
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr ""
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr ""
 
@@ -915,53 +915,53 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr ""
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr ""
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr ""
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr ""
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr ""
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr ""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr ""
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr ""
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr ""
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr ""
 
@@ -1001,7 +1001,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr ""
 
@@ -1073,23 +1073,23 @@ msgstr ""
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr ""
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 
@@ -1283,37 +1283,49 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr ""
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr ""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr ""
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
 msgstr ""
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1453,23 +1465,23 @@ msgstr ""
 msgid "return %1"
 msgstr ""
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr ""
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr ""
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr ""
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1722,17 +1734,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1740,11 +1752,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr ""
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2095,13 +2107,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr ""
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2244,7 +2256,7 @@ msgstr ""
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr ""
 
@@ -2490,11 +2502,11 @@ msgstr ""
 msgid "LTC"
 msgstr ""
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr ""
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr ""
 

libs/ardour/po/zh.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ardour 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2012-08-26 13:43+0800\n"
 "Last-Translator: Rui-huai Zhang <zrhzrh>\n"
 "Language-Team: zrhzrh <zrhzrh@mail.ustc.edu.cn>\n"
@@ -29,52 +29,52 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "音频磁盘流 %1: 无法吸入到硬盘"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr ""
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "程序错误: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "音频磁盘流: 声道 %1 超出范围"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr ""
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr ""
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr "音频播放列表(未使用)"
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -200,47 +200,47 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr "连接会话到引擎"
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr ""
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr "无法创建端口: %1"
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "音频引擎: 无法连接 %1 (%2) 到 %3 (%4)"
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "连接JACK失败"
 
@@ -537,7 +537,7 @@ msgstr "三角形"
 msgid "Rectangular"
 msgstr "长方形"
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -748,23 +748,23 @@ msgstr ""
 msgid "unknown file type for session %1"
 msgstr ""
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr ""
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr ""
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr "载入配置"
 
@@ -917,19 +917,19 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr "LADSPA: 模块没有描述符函数."
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr "LADSPA: 当发现插件时, 插件已经不见了."
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 #, fuzzy
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
@@ -937,35 +937,35 @@ msgid ""
 msgstr ""
 "插件\"%1\"使用非法参数数量. 这可能意味着插件的设计有所变动, 而且预设失效了."
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr "坏的符号发送至 LadspaPlugin::set_state"
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr "LADSPA: 没有 ladspa 端口数量"
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr "LADSPA: 没有LADSPA端口数据"
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADSPA: 无法从 \"%1\" 载入模块"
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr "无法定位HOME. 预设没被移除."
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "不能创建 %1. 预设没保存. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr ""
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "无法定位HOME. 预设没保存."
 
@@ -1005,7 +1005,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr "会话"
 
@@ -1077,23 +1077,23 @@ msgstr ""
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "MIDI磁盘流 %1: 无法写入硬盘"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr ""
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 
@@ -1287,37 +1287,49 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "程序错误:"
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr ""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr ""
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
 msgstr ""
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1457,23 +1469,23 @@ msgstr "导入: src_new() 失败 : %1"
 msgid "return %1"
 msgstr "返回 %1"
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr ""
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr ""
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr "损坏的符号发送至 Route::set_state() [%1]"
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1727,17 +1739,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1745,11 +1757,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr "会话: 无法从XML描述符创建播放列表."
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2112,13 +2124,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr ""
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2261,7 +2273,7 @@ msgstr ""
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "程序错误: %1 %2"
 
@@ -2511,11 +2523,11 @@ msgstr "MIDI时钟"
 msgid "LTC"
 msgstr "MTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr ""
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr "无法打开目录 %1 (%2)"
 

libs/ardour/region.cc

@@ -1490,6 +1490,20 @@ Region::uses_source (boost::shared_ptr<const Source> source) const
 		}
 	}
 
+	for (SourceList::const_iterator i = _master_sources.begin(); i != _master_sources.end(); ++i) {
+		if (*i == source) {
+			return true;
+		}
+
+		boost::shared_ptr<PlaylistSource> ps = boost::dynamic_pointer_cast<PlaylistSource> (*i);
+
+		if (ps) {
+			if (ps->playlist()->uses_source (source)) {
+				return true;
+			}
+		}
+	}
+
 	return false;
 }
 

libs/ardour/route.cc

@@ -98,6 +98,7 @@ Route::Route (Session& sess, string name, Flag flg, DataType default_type)
 	, _default_type (default_type)
 	, _remote_control_id (0)
 	, _in_configure_processors (false)
+	, _initial_io_setup (false)
 	, _custom_meter_position_noted (false)
 	, _last_custom_meter_was_at_end (false)
 {
@@ -136,6 +137,7 @@ Route::init ()
 	_input->PortCountChanging.connect_same_thread (*this, boost::bind (&Route::input_port_count_changing, this, _1));
 
 	_output->changed.connect_same_thread (*this, boost::bind (&Route::output_change_handler, this, _1, _2));
+	_output->PortCountChanging.connect_same_thread (*this, boost::bind (&Route::output_port_count_changing, this, _1));
 
 	/* add amp processor  */
 
@@ -1708,6 +1710,9 @@ Route::configure_processors_unlocked (ProcessorStreams* err)
 	}
 
 	ChanCount out;
+	bool seen_mains_out = false;
+	processor_out_streams = _input->n_ports();
+	processor_max_streams.reset();
 
 	list< pair<ChanCount,ChanCount> >::iterator c = configuration.begin();
 	for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p, ++c) {
@@ -1720,7 +1725,20 @@ Route::configure_processors_unlocked (ProcessorStreams* err)
 		processor_max_streams = ChanCount::max(processor_max_streams, c->first);
 		processor_max_streams = ChanCount::max(processor_max_streams, c->second);
 		out = c->second;
+
+		if (boost::dynamic_pointer_cast<Delivery> (*p)
+				&& boost::dynamic_pointer_cast<Delivery> (*p)->role() == Delivery::Main) {
+			/* main delivery will increase port count to match input.
+			 * the Delivery::Main is usually the last processor - followed only by
+			 * 'MeterOutput'.
+			 */
+			seen_mains_out = true;
 		}
+		if (!seen_mains_out) {
+			processor_out_streams = out;
+		}
+	}
+
 
 	if (_meter) {
 		_meter->reset_max_channels (processor_max_streams);
@@ -1999,6 +2017,7 @@ Route::set_state (const XMLNode& node, int version)
 	}
 
 	set_id (node);
+	_initial_io_setup = true;
 
 	if ((prop = node.property (X_("flags"))) != 0) {
 		_flags = Flag (string_2_enum (prop->value(), _flags));
@@ -2066,6 +2085,8 @@ Route::set_state (const XMLNode& node, int version)
 		_meter_type = MeterType (string_2_enum (prop->value (), _meter_type));
 	}
 
+	_initial_io_setup = false;
+
 	set_processor_state (processor_state);
 
 	// this looks up the internal instrument in processors
@@ -2946,6 +2967,9 @@ void
 Route::output_change_handler (IOChange change, void * /*src*/)
 {
 	bool need_to_queue_solo_change = true;
+	if (_initial_io_setup) {
+		return;
+	}
 
 	if ((change.type & IOChange::ConfigurationChanged)) {
 		/* This is called with the process lock held if change 
@@ -3758,6 +3782,19 @@ Route::input_port_count_changing (ChanCount to)
 	return false;
 }
 
+/** Called when there is a proposed change to the output port count */
+bool
+Route::output_port_count_changing (ChanCount to)
+{
+	for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+		if (processor_out_streams.get(*t) > to.get(*t)) {
+			return true;
+		}
+	}
+	/* The change is ok */
+	return false;
+}
+
 list<string>
 Route::unknown_processors () const
 {

libs/ardour/session_ltc.cc

@@ -81,6 +81,7 @@ Session::ltc_tx_initialize()
 	 * since the fps can change and A3's  min fps: 24000/1001 */
 	ltc_enc_buf = (ltcsnd_sample_t*) calloc((nominal_frame_rate() / 23), sizeof(ltcsnd_sample_t));
 	ltc_speed = 0;
+	ltc_prev_cycle = -1;
 	ltc_tx_reset();
 	ltc_tx_resync_latency();
 	Xrun.connect_same_thread (*this, boost::bind (&Session::ltc_tx_reset, this));
@@ -131,6 +132,7 @@ Session::ltc_tx_parse_offset() {
 	offset_tc.drop = timecode_drop_frames();
 	timecode_to_sample(offset_tc, ltc_timecode_offset, false, false);
 	ltc_timecode_negative_offset = !offset_tc.negative;
+	ltc_prev_cycle = -1;
 }
 
 void
@@ -243,10 +245,25 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 	 * The _generated timecode_ is offset by the port-latency,
 	 * therefore the offset depends on the direction of transport.
 	 */
-	framepos_t cycle_start_frame = (current_speed < 0) ? (start_frame - ltc_out_latency.max) : (start_frame + ltc_out_latency.max);
+	framepos_t cycle_start_frame;
+
+	if (current_speed < 0) {
+		cycle_start_frame = (start_frame - ltc_out_latency.max);
+	} else if (current_speed > 0) {
+		cycle_start_frame = (start_frame + ltc_out_latency.max);
+	} else {
+		/* There is no need to compensate for latency when not rolling
+		 * rather send the accurate NOW timecode
+		 * (LTC encoder compenates latency by sending earlier timecode)
+		 */
+		cycle_start_frame = start_frame;
+	}
 
 	/* LTC TV standard offset */
+	if (current_speed != 0) {
+		/* ditto - send "NOW" if not rolling */
 		cycle_start_frame -= ltc_frame_alignment(frames_per_timecode_frame(), TV_STANDARD(cur_timecode));
+	}
 
 	/* cycle-start may become negative due to latency compensation */
 	if (cycle_start_frame < 0) { cycle_start_frame = 0; }
@@ -261,7 +278,13 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 		ltc_tx_reset();
 	}
 
-	if (ltc_speed != new_ltc_speed) {
+	if (ltc_speed != new_ltc_speed
+			/* but only once if, current_speed changes to 0. In that case
+			 * new_ltc_speed is > 0 because (end_frame - start_frame) == jack-period for no-roll
+			 * but ltc_speed will still be 0
+			 */
+			&& (current_speed != 0 || ltc_speed != current_speed)
+			) {
 		/* check ./libs/ardour/interpolation.cc  CubicInterpolation::interpolate
 		 * if target_speed != current_speed we should interpolate, too.
 		 *
@@ -271,7 +294,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 		 * end_frame is calculated from 'frames_moved' which includes the interpolation.
 		 * so we're good.
 		 */
-		DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX2: speed change old: %1 cur: %2 tgt: %3 ctd: %4\n", ltc_speed, current_speed, target_speed, fabs(current_speed) - target_speed));
+		DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX2: speed change old: %1 cur: %2 tgt: %3 ctd: %4\n", ltc_speed, current_speed, target_speed, fabs(current_speed) - target_speed, new_ltc_speed));
 		speed_changed = true;
 		ltc_encoder_set_filter(ltc_encoder, LTC_RISE_TIME(new_ltc_speed));
 	}
@@ -291,6 +314,10 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 			ltc_speed = new_ltc_speed;
 			return;
 		}
+		if (start_frame != ltc_prev_cycle) {
+			DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX2: no-roll seek from %1 to %2 (%3)\n", ltc_prev_cycle, start_frame, cycle_start_frame));
+			ltc_tx_reset();
+		}
 	}
 
 	if (fabs(new_ltc_speed) > 10.0) {
@@ -374,6 +401,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 		}
 	}
 
+	ltc_prev_cycle = start_frame;
 	ltc_speed = new_ltc_speed;
 	DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX2: transport speed %1.\n", ltc_speed));
 
@@ -399,6 +427,9 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 
 	/* difference between current frame and TC frame in samples */
 	frameoffset_t soff = cycle_start_frame - tc_sample_start;
+	if (current_speed == 0) {
+		soff = 0;
+	}
 	DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX3: A3cycle: %1 = A3tc: %2 +off: %3\n",
 				cycle_start_frame, tc_sample_start, soff));
 
@@ -464,7 +495,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 
 		DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX4: now: %1 trs: %2 toff %3\n", cycle_start_frame, tc_sample_start, soff));
 
-		uint32_t cyc_off;
+		int32_t cyc_off;
 		if (soff < 0 || soff >= fptcf) {
 			/* session framerate change between (2) and now */
 			ltc_tx_reset();
@@ -500,7 +531,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 			restarting = true;
 		}
 
-		if (cyc_off > 0 && cyc_off <= nframes) {
+		if (cyc_off >= 0 && cyc_off <= (int32_t) nframes) {
 			/* offset in this cycle */
 			txf= rint(cyc_off / fabs(ltc_speed));
 			memset(out, 0, cyc_off * sizeof(Sample));

libs/ardour/ticker.cc

@@ -386,11 +386,10 @@ MidiClockTicker::send_position_event (uint32_t midi_beats, pframes_t offset)
 	}
 
 	/* split midi beats into a 14bit value */
-	MIDI::byte msg[3] = {
+	MIDI::byte msg[3];
-		MIDI_CMD_COMMON_SONG_POS,
+	msg[0] = MIDI_CMD_COMMON_SONG_POS;
-		midi_beats & 0x007f,
+	msg[1] = midi_beats & 0x007f;
-		midi_beats & 0x3f80
+	msg[2] = midi_beats >> 7;
-	};
 
 	_midi_port->midimsg (msg, sizeof (msg), offset);
 

libs/ardour/track.cc

@@ -477,6 +477,10 @@ Track::silent_roll (pframes_t nframes, framepos_t /*start_frame*/, framepos_t /*
 {
 	Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
 	if (!lm.locked()) {
+		framecnt_t playback_distance = _diskstream->calculate_playback_distance(nframes);
+		if (can_internal_playback_seek(playback_distance)) {
+			internal_playback_seek(playback_distance);
+		}
 		return 0;
 	}
 

libs/gtkmm2ext/po/cs.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-09 09:28-0400\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
-"PO-Revision-Date: 2013-02-22 21:09+0100\n"
+"PO-Revision-Date: 2013-06-13 22:33+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -75,16 +75,14 @@ msgstr "Alt"
 msgid "Meta"
 msgstr "Meta"
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: keyboard.cc:534
+#: keyboard.cc:542
-#, fuzzy
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
-"Soubor s přiřazením kláves pro Ardour \"%1\"se nepodařilo najít, nebo "
+"Soubor s přiřazením kláves \"%2\"se nepodařilo najít, nebo obsahuje chyby."
-"obsahuje chyby."
 
 #: tearoff.cc:57
 msgid "Click to tear this into its own window"

libs/gtkmm2ext/po/de.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 19:32+0100\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2013-02-05 19:50+0100\n"
 "Last-Translator: Edgar Aichinger <edogawa@aon.at>\n"
 "Language-Team: German <ardour-dev@lists.ardour.org>\n"
@@ -77,11 +77,11 @@ msgstr "Alt"
 msgid "Meta"
 msgstr "Meta"
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 "Die Tastenkürzel-Datei \"%1\" konnte nicht gefunden werden oder enthält "
@@ -98,4 +98,3 @@ msgstr "Klicken, um an das Hauptfenster anzudocken"
 #: textviewer.cc:34
 msgid "Close"
 msgstr "Schließen"
-

libs/gtkmm2ext/po/el.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.99beta23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2005-01-11\n"
 "Last-Translator: Muadibas\n"
 "Language-Team: Hellenic(Greek) <LL@li.org>\n"
@@ -72,11 +72,11 @@ msgstr ""
 msgid "Meta"
 msgstr ""
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr ""
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 

libs/gtkmm2ext/po/es.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-09 12:26+0100\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2013-02-09 16:21+0100\n"
 "Last-Translator: Pablo Fernández <pablo.fbus@gmail.com>\n"
 "Language-Team: Spanish\n"
@@ -53,17 +53,11 @@ msgstr "Lo siento %1, no puedo hacer eso"
 msgid "Command"
 msgstr ""
 
-#: keyboard.cc:69
+#: keyboard.cc:69 keyboard.cc:72 keyboard.cc:85 keyboard.cc:89
-#: keyboard.cc:72
-#: keyboard.cc:85
-#: keyboard.cc:89
 msgid "Control"
 msgstr ""
 
-#: keyboard.cc:70
+#: keyboard.cc:70 keyboard.cc:73 keyboard.cc:87 keyboard.cc:90
-#: keyboard.cc:73
-#: keyboard.cc:87
-#: keyboard.cc:90
 msgid "Key|Shift"
 msgstr ""
 
@@ -79,14 +73,15 @@ msgstr ""
 msgid "Meta"
 msgstr ""
 
-#: keyboard.cc:134
+#: keyboard.cc:139 keyboard.cc:531
-#: keyboard.cc:523
 msgid "Unknown"
 msgstr ""
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
-msgstr "El archivo de combinaciones de teclado no se encontró en \"%2\" o contiene errores."
+msgstr ""
+"El archivo de combinaciones de teclado no se encontró en \"%2\" o contiene "
+"errores."
 
 #: tearoff.cc:57
 msgid "Click to tear this into its own window"

libs/gtkmm2ext/po/fr.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2011-06-13 00:30+0200\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: en_US\n"
@@ -71,11 +71,11 @@ msgstr "Alt"
 msgid "Meta"
 msgstr "Meta"
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 #, fuzzy
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr "Raccourcis clavier pour %1 introuvable dans \"%1\" ou corrompu."

libs/gtkmm2ext/po/nn.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2013-01-01 20:30+0100\n"
 "Last-Translator: Eivind Ødegård <meinmycell-lists@yahoo.no>\n"
 "Language-Team: Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -76,11 +76,11 @@ msgstr ""
 msgid "Meta"
 msgstr ""
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 

libs/gtkmm2ext/po/pl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2008-04-10 10:54+0100\n"
 "Last-Translator: Piotr Zaryk <pzaryk@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -71,11 +71,11 @@ msgstr ""
 msgid "Meta"
 msgstr ""
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr ""
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 

libs/gtkmm2ext/po/pt.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2004-05-17 20:36+0200\n"
 "Last-Translator: Chris Ross <chris.ross@tebibyte.org>\n"
 "Language-Team: Portuguese\n"
@@ -72,11 +72,11 @@ msgstr ""
 msgid "Meta"
 msgstr ""
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr ""
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 

libs/gtkmm2ext/po/ru.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2012-12-31 01:38+0300\n"
 "Last-Translator: Александр Прокудин <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: русский <>\n"
@@ -78,11 +78,11 @@ msgstr "Alt"
 msgid "Meta"
 msgstr "Meta"
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 

libs/pbd/enums.cc

@@ -20,8 +20,6 @@
 #include "pbd/controllable.h"
 #include "pbd/enumwriter.h"
 
-void setup_libpbd_enums () __attribute__ ((constructor));
-
 using namespace PBD;
 using namespace std;
 

libs/pbd/pbd.cc

@@ -0,0 +1,67 @@
+/*
+    Copyright (C) 2011 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <iostream>
+#include <cstdlib>
+
+#include <giomm.h>
+
+#include <glibmm/thread.h>
+
+#include "pbd/pbd.h"
+#include "pbd/debug.h"
+#include "pbd/id.h"
+#include "pbd/enumwriter.h"
+
+#include "i18n.h"
+
+extern void setup_libpbd_enums ();
+
+namespace {
+
+static bool libpbd_initialized = false;
+
+}
+
+bool
+PBD::init ()
+{
+	if (libpbd_initialized) {
+		return true;
+	}
+
+	if (!Glib::thread_supported()) {
+		Glib::thread_init();
+	}
+
+	Gio::init ();
+
+	PBD::ID::init ();
+
+	setup_libpbd_enums ();
+
+	libpbd_initialized = true;
+	return true;
+}
+
+void
+PBD::cleanup ()
+{
+	EnumWriter::destroy ();
+}

libs/pbd/pbd/pbd.h

@@ -0,0 +1,30 @@
+/*
+    Copyright (C) 2011 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __libpbd_pbd_h__
+#define __libpbd_pbd_h__
+
+namespace PBD {
+
+	bool init ();
+	void cleanup ();
+
+} // namespace PBD
+
+#endif

libs/pbd/pbd/pthread_utils.h

@@ -35,7 +35,6 @@ int  pthread_create_and_store (std::string name, pthread_t  *thread, void * (*st
 void pthread_cancel_one (pthread_t thread);
 void pthread_cancel_all ();
 void pthread_kill_all (int signum);
-void pthread_exit_pbd (void* status);
 const char* pthread_name ();
 void pthread_set_name (const char* name);
 

libs/pbd/pthread_utils.cc

@@ -80,12 +80,34 @@ fake_thread_start (void* arg)
 	void* (*thread_work)(void*) = ts->thread_work;
 	void* thread_arg = ts->arg;
 
-	pthread_set_name (ts->name.c_str());
-
-	delete ts;
 	/* name will be deleted by the default handler for GStaticPrivate, when the thread exits */
 
-	return thread_work (thread_arg);
+	pthread_set_name (ts->name.c_str());
+
+	/* we don't need this object anymore */
+
+	delete ts;
+
+	/* actually run the thread's work function */
+
+	void* ret = thread_work (thread_arg);
+
+	/* cleanup */
+
+	pthread_mutex_lock (&thread_map_lock);
+
+	for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
+		if (pthread_equal ((*i), pthread_self())) {
+			all_threads.erase (i);
+			break;
+		}
+	}
+
+	pthread_mutex_unlock (&thread_map_lock);
+
+	/* done */
+
+	return ret;
 }
 
 int  
@@ -147,10 +169,17 @@ void
 pthread_cancel_all () 
 {	
 	pthread_mutex_lock (&thread_map_lock);
-	for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
+
+	for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ) {
+
+		ThreadMap::iterator nxt = i;
+		++nxt;
+
 		if (!pthread_equal ((*i), pthread_self())) {
 			pthread_cancel ((*i));
 		}
+
+		i = nxt;
 	}
 	all_threads.clear();
 	pthread_mutex_unlock (&thread_map_lock);
@@ -171,18 +200,3 @@ pthread_cancel_one (pthread_t thread)
 	pthread_mutex_unlock (&thread_map_lock);
 }
 
-void
-pthread_exit_pbd (void* status) 
-{	
-	pthread_t thread = pthread_self();
-
-	pthread_mutex_lock (&thread_map_lock);
-	for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
-		if (pthread_equal ((*i), thread)) {
-			all_threads.erase (i);
-			break;
-		}
-	}
-	pthread_mutex_unlock (&thread_map_lock);
-	pthread_exit (status);
-}

libs/pbd/wscript

@@ -58,6 +58,7 @@ libpbd_sources = [
     'openuri.cc',
     'pathexpand.cc',
     'pathscanner.cc',
+    'pbd.cc',
     'pool.cc',
     'property_list.cc',
     'pthread_utils.cc',

libs/surfaces/mackie/mackie_control_protocol.cc

@@ -101,7 +101,7 @@ MackieControlProtocol::MackieControlProtocol (Session& session)
 	, _gui (0)
 	, _zoom_mode (false)
 	, _scrub_mode (false)
-	, _flip_mode (false)
+	, _flip_mode (Normal)
 	, _view_mode (Mixer)
 	, _current_selected_track (-1)
 	, _modifier_state (0)
@@ -1271,11 +1271,11 @@ MackieControlProtocol::set_view_mode (ViewMode m)
 }
 
 void
-MackieControlProtocol::set_flip_mode (bool yn)
+MackieControlProtocol::set_flip_mode (FlipMode fm)
 {
 	Glib::Threads::Mutex::Lock lm (surfaces_lock);
 
-	_flip_mode = yn;
+	_flip_mode = fm;
 	
 	for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
 		(*s)->update_flip_mode_display ();

libs/surfaces/mackie/mackie_control_protocol.h

@@ -123,13 +123,13 @@ class MackieControlProtocol
 	void set_device (const std::string&, bool allow_activation = true);
 	void set_profile (const std::string&);
 
-	bool     flip_mode () const { return _flip_mode; }
+	FlipMode flip_mode () const { return _flip_mode; }
 	ViewMode view_mode () const { return _view_mode; }
 	bool zoom_mode () const { return _zoom_mode; }
 	bool     metering_active () const { return _metering_active; }
 
 	void set_view_mode (ViewMode);
-	void set_flip_mode (bool);
+	void set_flip_mode (FlipMode);
 
 	XMLNode& get_state ();
 	int set_state (const XMLNode&, int version);
@@ -278,7 +278,7 @@ class MackieControlProtocol
 	void*                    _gui;
 	bool                     _zoom_mode;
 	bool                     _scrub_mode;
-	bool                     _flip_mode;
+	FlipMode                 _flip_mode;
 	ViewMode                 _view_mode;
 	int                      _current_selected_track;
 	int                      _modifier_state;

libs/surfaces/mackie/mcp_buttons.cc

@@ -814,8 +814,12 @@ MackieControlProtocol::dyn_release (Button &)
 LedState
 MackieControlProtocol::flip_press (Button &) 
 { 
-	set_flip_mode (!_flip_mode);
+	if (_flip_mode != Normal) {
-	return (_flip_mode ? on : off);
+		set_flip_mode (Normal);
+	} else {
+		set_flip_mode (Mirror);
+	}
+	return ((_flip_mode != Normal) ? on : off);
 }
 LedState
 MackieControlProtocol::flip_release (Button &) 

libs/surfaces/mackie/strip.cc

@@ -291,7 +291,7 @@ Strip::notify_gain_changed (bool force_update)
 		
 		Control* control;
 
-		if (_surface->mcp().flip_mode()) {
+		if (_surface->mcp().flip_mode() != Normal) {
 			control = _vpot;
 		} else {
 			control = _fader;
@@ -304,7 +304,7 @@ Strip::notify_gain_changed (bool force_update)
 
 		if (force_update || normalized_position != _last_gain_position_written) {
 			
-			if (_surface->mcp().flip_mode()) {
+			if (_surface->mcp().flip_mode() != Normal) {
 				if (!control->in_use()) {
 					_surface->write (_vpot->set (normalized_position, true, Pot::wrap));
 				}
@@ -407,7 +407,7 @@ Strip::notify_panner_width_changed (bool force_update)
 		
 		if (force_update || pos != _last_pan_azi_position_written) {
 			
-			if (_surface->mcp().flip_mode()) {
+			if (_surface->mcp().flip_mode() != Normal) {
 
 				if (control == _fader) {
 					if (!control->in_use()) {
@@ -944,7 +944,7 @@ Strip::next_pot_mode ()
 {
 	vector<Evoral::Parameter>::iterator i;
 
-	if (_surface->mcp().flip_mode()) {
+	if (_surface->mcp().flip_mode() != Normal) {
 		/* do not change vpot mode while in flipped mode */
 		DEBUG_TRACE (DEBUG::MackieControl, "not stepping pot mode - in flip mode\n");
 		_surface->write (display (1, "Flip"));
@@ -997,7 +997,7 @@ Strip::set_vpot_parameter (Evoral::Parameter p)
 	case PanAzimuthAutomation:
 		pannable = _route->pannable ();
 		if (pannable) {
-			if (_surface->mcp().flip_mode()) {
+			if (_surface->mcp().flip_mode() != Normal) {
 				/* gain to vpot, pan azi to fader */
 				_vpot->set_control (_route->gain_control());
 				control_by_parameter[GainAutomation] = _vpot;
@@ -1025,7 +1025,7 @@ Strip::set_vpot_parameter (Evoral::Parameter p)
 	case PanWidthAutomation:
 		pannable = _route->pannable ();
 		if (pannable) {
-			if (_surface->mcp().flip_mode()) {
+			if (_surface->mcp().flip_mode() != Normal) {
 				/* gain to vpot, pan width to fader */
 				_vpot->set_control (_route->gain_control());
 				control_by_parameter[GainAutomation] = _vpot;

libs/timecode/src/time.cc

@@ -806,7 +806,7 @@ sample_to_timecode (
 		double timecode_frames_fraction;
 		int64_t timecode_frames_left;
 		const double frames_per_timecode_frame = sample_frame_rate / timecode_frames_per_second;
-		const int64_t frames_per_hour = (int32_t)(3600 * rint(timecode_frames_per_second) * frames_per_timecode_frame);
+		const int64_t frames_per_hour = (int64_t)(3600 * rint(timecode_frames_per_second) * frames_per_timecode_frame);
 
 		timecode.hours = offset_sample / frames_per_hour;
 
@@ -818,7 +818,7 @@ sample_to_timecode (
 		timecode.subframes = (int32_t) rint(timecode_frames_fraction * subframes_per_frame);
 		timecode_frames_left = (int64_t) floor (timecode_frames_left_exact);
 
-		if (timecode.subframes == subframes_per_frame) {
+		if (use_subframes && timecode.subframes == subframes_per_frame) {
 			timecode_frames_left++;
 			timecode.subframes = 0;
 		}

mcp/qcon.device

@@ -0,0 +1,14 @@
+<MackieProtocolDevice>
+  <Name value="Qcon"/>
+  <Strips value="8"/>
+  <Extenders value="0"/>
+  <MasterFader value="yes"/>
+  <TimecodeDisplay value="yes"/>
+  <TwoCharacterDisplay value="no"/>
+  <GlobalControls value="yes"/>
+  <JogWheel value="yes"/>
+  <TouchSenseFaders value="yes"/>
+  <LogicControlButtons value="yes"/>
+  <usesIPMIDI value="no"/>
+  <NoHandShake value="yes"/>
+</MackieProtocolDevice>

wscript

@@ -408,8 +408,6 @@ def options(opt):
                     help='Install MIME type, icons and .desktop file as per freedesktop.org standards')
     opt.add_option('--freebie', action='store_true', default=False, dest='freebie',
                     help='Build a version suitable for distribution as a zero-cost binary')
-    opt.add_option('--no-freesound', action='store_false', default=True, dest='freesound',
-                    help='Do not build with Freesound database support')
     opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile',
                     help='Compile for use with gprofile')
     opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs',
@@ -650,9 +648,6 @@ def configure(conf):
         conf.env['PHONE_HOME'] = True
     if opts.fpu_optimization:
         conf.env['FPU_OPTIMIZATION'] = True
-    if opts.freesound:
-        conf.define('FREESOUND',1)
-        conf.env['FREESOUND'] = True
     if opts.nls:
         conf.define('ENABLE_NLS', 1)
         conf.env['ENABLE_NLS'] = True
@@ -739,7 +734,6 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('FLAC',                  conf.is_defined('HAVE_FLAC'))
     write_config_text('FPU optimization',      opts.fpu_optimization)
     write_config_text('Freedesktop files',     opts.freedesktop)
-    write_config_text('Freesound',             opts.freesound)
     write_config_text('JACK session support',  conf.is_defined('JACK_SESSION'))
     write_config_text('LV2 UI embedding',      conf.is_defined('HAVE_SUIL'))
     write_config_text('LV2 support',           conf.is_defined('LV2_SUPPORT'))