Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Preference: Use QuicTime coder

Abel You978c2b66d282
diff --git a/toonz/sources/image/mov/tiio_mov_proxy.cpp b/toonz/sources/image/mov/tiio_mov_proxy.cpp
index 26bcae17f..452d3cadf 100644
--- a/toonz/sources/image/mov/tiio_mov_proxy.cpp
+++ b/toonz/sources/image/mov/tiio_mov_proxy.cpp
@@ -22,6 +22,7 @@
#include <QDataStream>
#include "tiio_mov_proxy.h"
+#include <toonz/preferences.h>
/*
For a list of supported commands through the 32-bit background server,
@@ -39,6 +40,7 @@ bool IsQuickTimeInstalled() {
// in tnzcore lib, the other in image. The core version is currently NEVER
// USED
// throughout Toonz, even if it's EXPORT-defined.
+ if (!Preferences::instance()->isUseQuickTimeBackend()) return false;
QLocalSocket socket;
if (!tipc::startSlaveConnection(&socket, t32bitsrv::srvName(), 3000,
t32bitsrv::srvCmdlinePrg(),
diff --git a/toonz/sources/include/toonz/preferences.h b/toonz/sources/include/toonz/preferences.h
index f2a2a65f2..619ced7e6 100644
--- a/toonz/sources/include/toonz/preferences.h
+++ b/toonz/sources/include/toonz/preferences.h
@@ -294,6 +294,7 @@ public:
int getFfmpegTimeout() { return getIntValue(ffmpegTimeout); }
QString getFastRenderPath() const { return getStringValue(fastRenderPath); }
bool getFfmpegMultiThread() const { return getBoolValue(ffmpegMultiThread); }
+ bool isUseQuickTimeBackend() const { return getBoolValue(quickTimeBackend); }
QString getRhubarbPath() const { return getStringValue(rhubarbPath); }
int getRhubarbTimeout() { return getIntValue(rhubarbTimeout); }
diff --git a/toonz/sources/include/toonz/preferencesitemids.h b/toonz/sources/include/toonz/preferencesitemids.h
index 0b3102de6..fd395753a 100644
--- a/toonz/sources/include/toonz/preferencesitemids.h
+++ b/toonz/sources/include/toonz/preferencesitemids.h
@@ -81,6 +81,7 @@ enum PreferencesItemId {
ffmpegTimeout,
fastRenderPath,
ffmpegMultiThread,
+ quickTimeBackend,
rhubarbPath,
rhubarbTimeout,
diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp
index 85e72fb0d..a4fcf7711 100644
--- a/toonz/sources/toonz/preferencespopup.cpp
+++ b/toonz/sources/toonz/preferencespopup.cpp
@@ -1283,6 +1283,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
{fastRenderPath, tr("Fast Render Path:")},
{ffmpegMultiThread,
tr("Allow Multi-Thread in FFMPEG Rendering (UNSTABLE)")},
+ {quickTimeBackend, tr("Use QuickTime to code .mov and .3gp (If installed)")},
{rhubarbPath, tr("Rhubarb Path:")},
{rhubarbTimeout, tr("Rhubarb Timeout:")},
@@ -1984,6 +1985,7 @@ QWidget* PreferencesPopup::createImportExportPage() {
"but a random crash might occur, use at your own risk."),
lay);
insertUI(ffmpegMultiThread, lay);
+ insertUI(quickTimeBackend, lay);
lay->setRowStretch(lay->rowCount(), 1);
insertFootNote(lay);
diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cpp
index edfad435f..bb5257989 100644
--- a/toonz/sources/toonzlib/preferences.cpp
+++ b/toonz/sources/toonzlib/preferences.cpp
@@ -500,6 +500,7 @@ void Preferences::definePreferenceItems() {
std::numeric_limits<int>::max());
define(fastRenderPath, "fastRenderPath", QMetaType::QString, "desktop");
define(ffmpegMultiThread, "ffmpegMultiThread", QMetaType::Bool, false);
+ define(quickTimeBackend, "quickTimeBacend", QMetaType::Bool, false);
define(rhubarbPath, "rhubarbPath", QMetaType::QString, "");
define(rhubarbTimeout, "rhubarbTimeout", QMetaType::Int, 600, 0,
std::numeric_limits<int>::max());