Fix uninitialized compiler warnings.

mltframework · Oct 8, 2014 · 5bb8c48 · 5bb8c48
1 parent 6ec8bcc
commit 5bb8c48
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/CuteLogger/src/Logger.cpp b/CuteLogger/src/Logger.cpp
@@ -243,7 +243,7 @@ static void cleanupLoggerPrivate()
 #if QT_VERSION >= 0x050000
 static void qtLoggerMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg)
 {
-  Logger::LogLevel level;
+  Logger::LogLevel level = Logger::Error;
   switch (type)
   {
     case QtDebugMsg:

diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp
@@ -441,8 +441,8 @@ void EncodeDock::on_presetsTree_clicked(const QModelIndex &index)
             preset = new Mlt::Properties((mlt_properties) m_presets->get_data(name.toLatin1().constData()));
         }
         if (preset->is_valid()) {
-            int audioQuality;
-            int videoQuality;
+            int audioQuality = -1;
+            int videoQuality = -1;
             QStringList other;
             QStringList textParts = name.split('/');
 
@@ -585,7 +585,7 @@ void EncodeDock::on_presetsTree_clicked(const QModelIndex &index)
 
             // normalize the quality settings
             // quality depends on codec
-            if (ui->audioRateControlCombo->currentIndex() == RateControlQuality) {
+            if (ui->audioRateControlCombo->currentIndex() == RateControlQuality && audioQuality > -1) {
                 const QString& acodec = ui->audioCodecCombo->currentText();
                 if (acodec == "libmp3lame") // 0 (best) - 9 (worst)
                     ui->audioQualitySpinner->setValue(TO_RELATIVE(9, 0, audioQuality));
@@ -595,7 +595,7 @@ void EncodeDock::on_presetsTree_clicked(const QModelIndex &index)
                     // aac: 0 (worst) - 500 (best)
                     ui->audioQualitySpinner->setValue(TO_RELATIVE(0, 500, audioQuality));
             }
-            if (ui->videoRateControlCombo->currentIndex() == RateControlQuality) {
+            if (ui->videoRateControlCombo->currentIndex() == RateControlQuality && videoQuality > -1) {
                 const QString& vcodec = ui->videoCodecCombo->currentText();
                 //val = min + (max - min) * paramval;
                 if (vcodec == "libx264") // 0 (best, 100%) -51 (worst)

diff --git a/src/main.cpp b/src/main.cpp
@@ -31,7 +31,7 @@ static void mlt_log_handler(void *service, int mlt_level, const char *format, va
     if (mlt_level > mlt_log_get_level())
         return;
 
-    enum Logger::LogLevel cuteLoggerLevel;
+    enum Logger::LogLevel cuteLoggerLevel = Logger::Fatal;
     switch (mlt_level) {
     case MLT_LOG_DEBUG:
         cuteLoggerLevel = Logger::Trace;

diff --git a/src/mvcp/mvcpthread.cpp b/src/mvcp/mvcpthread.cpp
@@ -46,7 +46,7 @@ void MvcpThread::run()
         mvcp lmvcp = mvcp_init(parser);
         mvcp_response_close(response);
         int command = COMMAND_INVALID;
-        QObject* parameters;
+        QObject* parameters = 0;
 
         m_mutex.lock();
         if (!m_commands.isEmpty()) {
@@ -56,18 +56,20 @@ void MvcpThread::run()
         m_mutex.unlock();
 
         while (!m_quit) {
-            switch (command) {
-            case COMMAND_ULS:
-                do_uls(lmvcp, parameters);
-                break;
-            case COMMAND_CLS:
-                do_cls(lmvcp, parameters);
-                break;
-            case COMMAND_USTA:
-                do_usta(lmvcp, parameters);
-                break;
-            default:
-                break;
+            if (parameters) {
+                switch (command) {
+                case COMMAND_ULS:
+                    do_uls(lmvcp, parameters);
+                    break;
+                case COMMAND_CLS:
+                    do_cls(lmvcp, parameters);
+                    break;
+                case COMMAND_USTA:
+                    do_usta(lmvcp, parameters);
+                    break;
+                default:
+                    break;
+                }
             }
             m_mutex.lock();
             while (!m_quit && m_commands.isEmpty())