diff options
| author | Robin Gareus <robin@gareus.org> | 2015-10-23 23:28:25 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-23 23:29:04 +0200 |
| commit | 076ca20321d1005de2f8bbd177f3ddb19212112a (patch) | |
| tree | 43485904a0a75766749def526fe051d840e4856a /gtk2_ardour/transcode_ffmpeg.cc | |
| parent | eb6b4f4b15cd17f803efd9ad09ce5822ae0cdc76 (diff) | |
Delete SystemExec in the main process thread.
Diffstat (limited to 'gtk2_ardour/transcode_ffmpeg.cc')
| -rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index efe4e44ebe..949565d22b 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -96,7 +96,7 @@ TranscodeFfmpeg::probe () argp[6] = 0; ffcmd = new ARDOUR::SystemExec(ffprobe_exe, argp); ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffprobeparse, this, _1 ,_2)); - ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this)); + ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context()); if (ffcmd->start(1)) { ffexit(); return false; @@ -110,6 +110,7 @@ TranscodeFfmpeg::probe () int timeout = 300; // 1.5 sec while (ffcmd && --timeout > 0) { Glib::usleep(5000); + ARDOUR::GUIIdle(); } if (timeout == 0 || ffoutput.empty()) { return false; @@ -399,7 +400,7 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp); ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_v, this, _1 ,_2)); - ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this)); + ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context()); if (ffcmd->start(2)) { ffexit(); return false; @@ -447,7 +448,7 @@ TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t /*sample ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp); ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_a, this, _1 ,_2)); - ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this)); + ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context()); if (ffcmd->start(2)) { ffexit(); return false; @@ -506,7 +507,7 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh, #endif ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp); ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_v, this, _1 ,_2)); - ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this)); + ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context()); if (ffcmd->start(2)) { ffexit(); return false; |