diff options
| -rw-r--r-- | gtk2_ardour/add_video_dialog.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/export_video_dialog.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/chan_count.h | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/device_info.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/surface.cc | 3 |
6 files changed, 11 insertions, 3 deletions
diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc index 6d6830d26b..5fc53c7de2 100644 --- a/gtk2_ardour/add_video_dialog.cc +++ b/gtk2_ardour/add_video_dialog.cc @@ -333,7 +333,7 @@ AddVideoDialog::file_name (bool &local_file) char *ue = curl_easy_unescape(curl, uri.c_str(), uri.length(), &plen); #ifdef PLATFORM_WINDOWS char *tmp; - while (tmp = strchr(ue, '/')) *tmp = '\\'; + while ((tmp = strchr(ue, '/'))) *tmp = '\\'; #endif std::string path = video_get_docroot(Config) + ue; if (!::access(path.c_str(), R_OK)) { diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index 13f1f8fe4d..c497933e4b 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -195,7 +195,9 @@ ExportVideoDialog::ExportVideoDialog () t->attach (aspect_combo, 3, 4, ty, ty+1); ty++; t->attach (bframes_checkbox, 0, 2, ty, ty+1); t->attach (deinterlace_checkbox, 2, 4, ty, ty+1); ty++; +#ifndef PLATFORM_WINDOWS t->attach (meta_checkbox, 2, 4, ty, ty+1); ty++; +#endif t->attach (optimizations_checkbox, 0, 1, ty, ty+1); t->attach (optimizations_label, 1, 4, ty, ty+1); ty++; #if 1 /* tentative debug mode */ diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index 94f8527cbb..2f0cb09074 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -326,10 +326,13 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf argp[a++] = strdup(it->first.c_str()); argp[a++] = strdup(it->second.c_str()); } +#ifndef PLATFORM_WINDOWS + // quote-escape does not work here. this needs further work (system_exec.cc) for(TranscodeFfmpeg::FFSettings::const_iterator it = meta.begin(); it != meta.end(); ++it) { argp[a++] = strdup("-metadata"); argp[a++] = format_metadata(it->first.c_str(), it->second.c_str()); } +#endif if (m_fps > 0) { m_lead_in = rint (m_lead_in * m_fps) / m_fps; diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h index 9f9fd07543..b613f67a3c 100644 --- a/libs/ardour/ardour/chan_count.h +++ b/libs/ardour/ardour/chan_count.h @@ -154,7 +154,7 @@ private: } // namespace ARDOUR -std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c); +LIBARDOUR_API std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c); #endif // __ardour_chan_count_h__ diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index a50d25607a..a4b967c8f4 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -246,6 +246,8 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */) if ((prop = child->property ("value")) != 0) { if ((_master_position = atoi (prop->value().c_str())) == 0) { _master_position = 0; + } else if (_master_position > 0) { + _master_position --; } } } diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index b918f67025..6777d8e07e 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -97,7 +97,7 @@ Surface::Surface (MackieControlProtocol& mcp, const std::string& device_name, ui /* lets use master_position instead */ uint32_t mp = _mcp.device_info().master_position(); if (_number == mp) { - DEBUG_TRACE (DEBUG::MackieControl, "Surface is first. Might have global controls.\n"); + DEBUG_TRACE (DEBUG::MackieControl, "Surface matches MasterPosition. Might have global controls.\n"); if (_mcp.device_info().has_global_controls()) { init_controls (); DEBUG_TRACE (DEBUG::MackieControl, "init_controls done\n"); @@ -508,6 +508,7 @@ Surface::handle_midi_controller_message (MIDI::Parser &, MIDI::EventTwoBytes* ev _jog_wheel->jog_event (delta); return; } + // add external (pedal?) control here return; } |