smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

Disable video-export metadata on windows (for now)

Browse source 
Quote escaping metadata currently breaks export.
This commit is contained in:
Robin Gareus 2015-08-10 00:35:24 +02:00
parent 466c50d3a0
commit 54ab3fb37e
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/export_video_dialog.cc
View file

@ -195,7 +195,9 @@ ExportVideoDialog::ExportVideoDialog ()
t->attach (aspect_combo, 3, 4, ty, ty+1); ty++; t->attach (aspect_combo, 3, 4, ty, ty+1); ty++;
t->attach (bframes_checkbox, 0, 2, ty, ty+1); t->attach (bframes_checkbox, 0, 2, ty, ty+1);
t->attach (deinterlace_checkbox, 2, 4, ty, ty+1); ty++; t->attach (deinterlace_checkbox, 2, 4, ty, ty+1); ty++;
#ifndef PLATFORM_WINDOWS
t->attach (meta_checkbox, 2, 4, ty, ty+1); ty++; t->attach (meta_checkbox, 2, 4, ty, ty+1); ty++;
#endif
t->attach (optimizations_checkbox, 0, 1, ty, ty+1); t->attach (optimizations_checkbox, 0, 1, ty, ty+1);
t->attach (optimizations_label, 1, 4, ty, ty+1); ty++; t->attach (optimizations_label, 1, 4, ty, ty+1); ty++;
#if 1 /* tentative debug mode */ #if 1 /* tentative debug mode */

3
gtk2_ardour/transcode_ffmpeg.cc
View file

@ -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->first.c_str());
argp[a++] = strdup(it->second.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) { for(TranscodeFfmpeg::FFSettings::const_iterator it = meta.begin(); it != meta.end(); ++it) {
argp[a++] = strdup("-metadata"); argp[a++] = strdup("-metadata");
argp[a++] = format_metadata(it->first.c_str(), it->second.c_str()); argp[a++] = format_metadata(it->first.c_str(), it->second.c_str());
} }
#endif
if (m_fps > 0) { if (m_fps > 0) {
m_lead_in = rint (m_lead_in * m_fps) / m_fps; m_lead_in = rint (m_lead_in * m_fps) / m_fps;