Merge branch 'ardour'

gtk2_ardour/ardour_ui.cc

@@ -2278,8 +2278,6 @@ ARDOUR_UI::update_clocks ()
 void
 ARDOUR_UI::start_clocking ()
 {
-	std::cerr << "start clocking\n";
-
 	if (UIConfiguration::instance().get_no_strobe()) {
 		if (!_session) {
 			return;

gtk2_ardour/ardour_ui_aaf.cc

@@ -188,7 +188,17 @@ import_sndfile_as_region (Session* s, struct aafiAudioEssencePointer* aafAudioEs
 		}
 
 		for (int i = 0; i < channelCount; i++) {
+			PropertyList proplist;
 			sources->push_back (status.sources.at (i));
+
+			proplist.add (ARDOUR::Properties::start, 0);
+			proplist.add (ARDOUR::Properties::length, timecnt_t ((*sources)[0]->length (), pos));
+			proplist.add (ARDOUR::Properties::name, aafAudioEssencePtrList->essenceFile->unique_name);
+			proplist.add (ARDOUR::Properties::layer, 0);
+			proplist.add (ARDOUR::Properties::whole_file, true);
+			proplist.add (ARDOUR::Properties::external, true);
+
+			RegionFactory::create (*sources, proplist);
 		}
 
 		/* build peakfiles */
@@ -202,8 +212,7 @@ import_sndfile_as_region (Session* s, struct aafiAudioEssencePointer* aafAudioEs
 	*oneClipSources = sources;
 
 	/* Put the source on a region */
-	std::shared_ptr<Region> region;
-	string                  region_name;
+	string region_name;
 
 	/* take all the sources we have and package them up as a region */
 	region_name = region_name_from_path (status.paths.front (), (sources->size () > 1), false);
@@ -213,17 +222,6 @@ import_sndfile_as_region (Session* s, struct aafiAudioEssencePointer* aafAudioEs
 		region_name = bump_name_once (region_name, '.');
 	}
 
-	PropertyList proplist;
-
-	proplist.add (ARDOUR::Properties::start, 0);
-	proplist.add (ARDOUR::Properties::length, timecnt_t ((*sources)[0]->length (), pos));
-	proplist.add (ARDOUR::Properties::name, aafAudioEssencePtrList->essenceFile->unique_name);
-	proplist.add (ARDOUR::Properties::layer, 0);
-	proplist.add (ARDOUR::Properties::whole_file, true);
-	proplist.add (ARDOUR::Properties::external, true);
-
-	region = RegionFactory::create (*sources, proplist);
-	regions.push_back (region);
 	return true;
 }
 

gtk2_ardour/ardour_ui_engine.cc

@@ -122,7 +122,6 @@ ARDOUR_UI::create_xrun_marker (samplepos_t where)
 void
 ARDOUR_UI::halt_on_xrun_message ()
 {
-	cerr << "HALT on xrun\n";
 	ArdourMessageDialog msg (_main_window, _("Recording was stopped because your system could not keep up."));
 	msg.run ();
 }

gtk2_ardour/editor.cc

@@ -655,7 +655,6 @@ Editor::Editor ()
 
 	_cursors = new MouseCursors;
 	_cursors->set_cursor_set (UIConfiguration::instance().get_icon_set());
-	cerr << "Set cursor set to " << UIConfiguration::instance().get_icon_set() << endl;
 
 	/* Push default cursor to ever-present bottom of cursor stack. */
 	push_canvas_cursor(_cursors->grabber);

gtk2_ardour/midi_region_view.cc

@@ -4751,8 +4751,6 @@ MidiRegionView::note_to_y(uint8_t note) const
 void
 MidiRegionView::quantize_selected_notes ()
 {
-	std::cerr << "QSN!\n";
-
 	RegionSelection rs;
 	rs.push_back (this);
 

gtk2_ardour/plugin_ui.cc

@@ -200,9 +200,6 @@ PluginUIWindow::PluginUIWindow (std::shared_ptr<PlugInsertBase> pib,
 
 PluginUIWindow::~PluginUIWindow ()
 {
-#ifndef NDEBUG
-	cerr << "PluginWindow deleted for " << this << endl;
-#endif
 	delete _pluginui;
 
 	if (the_plugin_window == this) {

libs/ardour/butler.cc

@@ -303,7 +303,9 @@ Butler::thread_work ()
 						break;
 					default:
 						error << string_compose (_("Butler read ahead failure on dstream %1"), tr->name ()) << endmsg;
+#ifndef NDEBUG
 						std::cerr << string_compose (_("Butler read ahead failure on dstream %1"), tr->name ()) << std::endl;
+#endif
 						break;
 				}
 			});
@@ -396,7 +398,9 @@ Butler::flush_tracks_to_disk_normal (std::shared_ptr<RouteList const> rl, uint32
 			default:
 				errors++;
 				error << string_compose (_("Butler write-behind failure on dstream %1"), (*i)->name ()) << endmsg;
+#ifndef NDEBUG
 				std::cerr << string_compose (_("Butler write-behind failure on dstream %1"), (*i)->name ()) << std::endl;
+#endif
 				/* don't break - try to flush all streams in case they
 			   are split across disks.
 			*/

libs/ardour/disk_reader.cc

@@ -419,7 +419,9 @@ DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
 				if (available == 0 && !chaninfo->initialized) {
 					disk_buf.silence (disk_samples_to_consume);
 				} else if (disk_samples_to_consume > available) {
+#ifndef NDEBUG // not rt-safe to print here
 					cerr << "underrun for " << _name << " Available samples: " << available << " required: " << disk_samples_to_consume << endl;
+#endif
 					DEBUG_TRACE (DEBUG::Butler, string_compose ("%1 underrun in %2, total space = %3 vs %4\n", DEBUG_THREAD_SELF, name (), available, disk_samples_to_consume));
 					Underrun ();
 					return;

libs/ardour/session_state.cc

@@ -4566,7 +4566,7 @@ Session::config_changed (std::string p, bool ours)
 		bool have_ms = _monitor_out ? true : false;
 		if (loading ()) {
 			/* When loading an existing session, the config "use-monitor-bus"
-			 * is ignored. Instead the sesion-state (xml) will have added the
+			 * is ignored. Instead the session-state (xml) will have added the
 			 * "monitor-route" and restored its state (and connections)
 			 * if the session has a monitor-section.
 			 * Update the config to reflect this.
@@ -4595,7 +4595,7 @@ Session::config_changed (std::string p, bool ours)
 		bool have_sm = _surround_master ? true : false;
 		if (loading ()) {
 			/* When loading an existing session, the config "use-surround-master"
-			 * is ignored. Instead the sesion-state (xml) will have added the
+			 * is ignored. Instead the session-state (xml) will have added the
 			 * "surround-master" and restored its state (and connections)
 			 * if the session has a surround master..
 			 * Update the config to reflect this.
@@ -4630,7 +4630,6 @@ Session::config_changed (std::string p, bool ours)
 		}
 	} else if (p == "default-time-domain") {
 		Temporal::TimeDomain td = config.get_default_time_domain ();
-		std::cerr << "Setting time domain\n";
 		set_time_domain (td);
 		Config->set_preferred_time_domain(td);  /* sync the global default time domain to this newly chosen one */
 	}

libs/widgets/ardour_button.cc

@@ -629,7 +629,7 @@ ArdourButton::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_
 	//
 	//A: yes, it's keyboard focus and it does work when there's no editor window
 	//   (the editor is always the first receiver for KeyDown).
-	//   It's needed for eg. the engine-dialog at startup or after closing a sesion.
+	//   It's needed for eg. the engine-dialog at startup or after closing a session.
 	if (_focused) {
 		rounded_function (cr, 1.5, 1.5, get_width() - 3, get_height() - 3, corner_radius);
 		cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.8);

session_utils/new_empty_session.cc

@@ -43,7 +43,7 @@ static void usage ()
 	printf ("\n\
 This tool creates a new empty Ardour session.\n\
 \n\
-If the session-name is unspecified, the sesion-dir-name is used.\n\
+If the session-name is unspecified, the session-dir-name is used.\n\
 If specified, the tool expects a session-name without .ardour\n\
 file-name extension.\n\
 \n");

session_utils/new_session.cc

@@ -50,7 +50,7 @@ static void usage ()
 This tool creates a new Ardour session, optionally based on a\n\
 session-template.\n\
 \n\
-If the session-name is unspecified, the sesion-dir-name is used.\n\
+If the session-name is unspecified, the session-dir-name is used.\n\
 If specified, the tool expects a session-name without .ardour\n\
 file-name extension.\n\
 \n\