Merge branch 'master' into audioengine

8 files changed, 19 insertions, 21 deletions

diff --git a/doc/monitor_modes.pdf b/doc/monitor_modes.pdf
index d4c4232580..97c46bb55e 100644
--- a/doc/monitor_modes.pdf
+++ b/doc/monitor_modes.pdf
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index b8f94ac55c..48d09065b7 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -104,7 +104,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);
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 986ed7f985..5f8564374e 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -64,9 +64,7 @@
 #include "main_clock.h"
 #include "public_editor.h"
 
-#ifdef FREESOUND
 #include "sfdb_freesound_mootcher.h"
-#endif
 
 #include "i18n.h"
 
@@ -516,8 +514,6 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi
 	
 	notebook.append_page (*vbox, _("Search Tags"));
 
-#ifdef FREESOUND
-
 	//add freesound search
 
 	HBox* passbox;
@@ -593,7 +589,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)))));
@@ -1149,7 +1144,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));
@@ -1157,7 +1151,6 @@ SoundFileBrowser::get_paths ()
 				results.push_back (str);
 			}
 		}
-#endif
 	}
 
 	return results;
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc
index 3be2450ca7..d4ad8a24ed 100644
--- a/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@ -110,7 +110,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);
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index f4e1119aeb..1f4c7940f8 100644
--- a/gtk2_ardour/wscript
+++ b/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',
@@ -434,10 +435,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'
 
diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc
index d52d9e919a..b2fbaf602c 100644
--- a/libs/ardour/session_ltc.cc
+++ b/libs/ardour/session_ltc.cc
@@ -496,7 +496,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();
@@ -532,7 +532,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));
diff --git a/mcp/qcon.device b/mcp/qcon.device
new file mode 100644
index 0000000000..48c5390835
--- /dev/null
+++ b/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>
diff --git a/wscript b/wscript
index 956925cb42..d887fe6822 100644
--- a/wscript
+++ b/wscript
@@ -418,8 +418,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',
@@ -642,9 +640,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
@@ -718,7 +713,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'))