WebSVN – tpanel – Diff – /trunk/tqtmain.cpp

     gPageManager->regCallbackResetSurface(bind(&MainWindow::_resetSurface, this));
     gPageManager->regCallbackShutdown(bind(&MainWindow::_shutdown, this));
     gPageManager->regCallbackPlaySound(bind(&MainWindow::_playSound, this, std::placeholders::_1));
     gPageManager->regCallbackStopSound(bind(&MainWindow::_stopSound, this));
     gPageManager->regCallbackMuteSound(bind(&MainWindow::_muteSound, this, std::placeholders::_1));
+    gPageManager->regCallbackSetVolume(bind(&MainWindow::_setVolume, this, std::placeholders::_1));
     gPageManager->registerCBsetVisible(bind(&MainWindow::_setVisible, this, std::placeholders::_1, std::placeholders::_2));
     gPageManager->regSendVirtualKeys(bind(&MainWindow::_sendVirtualKeys, this, std::placeholders::_1));
     gPageManager->regShowPhoneDialog(bind(&MainWindow::_showPhoneDialog, this, std::placeholders::_1));
     gPageManager->regSetPhoneNumber(bind(&MainWindow::_setPhoneNumber, this, std::placeholders::_1));
     gPageManager->regSetPhoneStatus(bind(&MainWindow::_setPhoneStatus, this, std::placeholders::_1));
         connect(this, &MainWindow::sigListBox, this, &MainWindow::listBox);
         connect(this, &MainWindow::sigKeyboard, this, &MainWindow::showKeyboard);
         connect(this, &MainWindow::sigKeypad, this, &MainWindow::showKeypad);
         connect(this, &MainWindow::sigShowSetup, this, &MainWindow::showSetup);
         connect(this, &MainWindow::sigPlaySound, this, &MainWindow::playSound);
+        connect(this, &MainWindow::sigSetVolume, this, &MainWindow::setVolume);
         connect(this, &MainWindow::sigDropButton, this, &MainWindow::dropButton);
         connect(this, &MainWindow::sigSetVisible, this, &MainWindow::SetVisible);
         connect(this, &MainWindow::sigSendVirtualKeys, this, &MainWindow::sendVirtualKeys);
         connect(this, &MainWindow::sigShowPhoneDialog, this, &MainWindow::showPhoneDialog);
         connect(this, &MainWindow::sigSetPhoneNumber, this, &MainWindow::setPhoneNumber);
     DECL_TRACER("MainWindow::_muteSound(bool state)");
     emit sigMuteSound(state);
+}
+void MainWindow::_setVolume(int volume)
+{
+    DECL_TRACER("MainWindow::_setVolume(int volume)");
+    emit sigSetVolume(volume);
+}
 void MainWindow::_setOrientation(J_ORIENTATION ori)
+{
 #ifdef Q_OS_ANDROID
     DECL_TRACER("MainWindow::_setOriantation(J_ORIENTATION ori)");
 int MainWindow::calcVolume(int value)
+{
     DECL_TRACER("TQtSettings::calcVolume(int value)");
     // volumeSliderValue is in the range [0..100]
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+//#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     qreal linearVolume = QAudio::convertVolume(value / qreal(100.0),
                                                QAudio::LogarithmicVolumeScale,
                                                QAudio::LinearVolumeScale);
     return qRound(linearVolume * 100);
-#else
+//#else
-    return value;
+//    return value;
-#endif
+//#endif
+}
 /**
  * @brief MainWindow::convertMask
  * Converts the AMX mask for input lines into Qt mask sympols for input lines.
     OBJECT_t *obj = findObject(handle);
     if (!obj)
+    {
         MSG_WARNING("Object " << handleToString(handle) << " (SubPage) does not exist. Ignoring!");
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return;
+    }
     if (obj->type != OBJ_SUBPAGE)
+    {
         MSG_WARNING("Object " << handleToString(handle) << " is not a SubPage!");
+#if TESTMODE == 1
+        setScreenDone();
+#endif
         return;
+    }
     MSG_DEBUG("Dropping subpage " << handleToString(handle));
     invalidateAllSubObjects(handle);
+    {
         obj->invalid = true;
         obj->remove = false;
         if (obj->object.widget)
+        {
             obj->object.widget->hide();
+#if TESTMODE == 1
+            __success = true;
+            setScreenDone();
+#endif
+        }
+    }
+}
 void MainWindow::dropButton(ulong handle)
+{
     if (!mMediaPlayer)
+    {
         mMediaPlayer = new QMediaPlayer;
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         mAudioOutput = new QAudioOutput;
+        mMediaPlayer->setAudioOutput(mAudioOutput);
 #endif
+    }
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     mMediaPlayer->setMedia(QUrl::fromLocalFile(file.c_str()));
     mMediaPlayer->setVolume(calcVolume(TConfig::getSystemVolume()));
+    if (mMediaPlayer->playbackState() != QMediaPlayer::StoppedState)
+        mMediaPlayer->stop();
 #else
     mMediaPlayer->setSource(QUrl::fromLocalFile(file.c_str()));
-    mAudioOutput->setVolume(TConfig::getSystemVolume());
+    mAudioOutput->setVolume(calcVolume(TConfig::getSystemVolume()));
+    if (!mMediaPlayer->isAvailable())
+    {
+        MSG_WARNING("No audio modul found!");
+#if TESTMODE == 1
+        setAllDone();
 #endif
+        return;
+    }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    if (mMediaPlayer->isPlaying())
+        mMediaPlayer->stop();
+#else
+    if (mMediaPlayer->playbackState() != QMediaPlayer::StoppedState)
+        mMediaPlayer->stop();
+#endif  // #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#endif  // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     mMediaPlayer->play();
 #if TESTMODE == 1
+    QMediaPlayer::Error err = QMediaPlayer::NoError;
+    if ((err = mMediaPlayer->error()) != QMediaPlayer::NoError)
+    {
+        MSG_ERROR("Error playing \"" << file << "\": " << mMediaPlayer->errorString().toStdString());
+    }
+    else
-    __success = true;
+        __success = true;
     setAllDone();
 #endif
+}
 void MainWindow::stopSound()
         mMediaPlayer->setMuted(state);
 #else
     if (mAudioOutput)
         mAudioOutput->setMuted(state);
 #endif
+#if TESTMODE == 1
+    __success = true;
+    setAllDone();
+#endif
+}
+void MainWindow::setVolume(int volume)
+{
+    DECL_TRACER("MainWindow::setVolume(int volume)");
+    if (!mMediaPlayer)
+    {
+#if TESTMODE == 1
+        setAllDone();
+#endif
+        return;
+    }
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    mMediaPlayer->setVolume(calcVolume(volume));
+#else
+    if (!mMediaPlayer || !mAudioOutput)
+    {
+#if TESTMODE == 1
+        setAllDone();
+#endif
+        return;
+    }
+    mAudioOutput->setVolume(calcVolume(volume));
+#if TESTMODE == 1
+    MSG_DEBUG("Volume was set to " << volume);
+    __success = true;
+    setAllDone();
+#endif
+#endif  // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+}
 void MainWindow::playShowList()
+{
     DECL_TRACER("MainWindow::playShowList()");
         default:
             MSG_WARNING("Subpage effect " << ani.showEffect << " is not supported.");
             delete obj->animation;
             obj->animation = nullptr;
-#if TESTMODE == 1
-            setScreenDone();
-#endif
             return false;
+    }
     return true;
+}

Subversion Repositories tpanel

(root)/trunk/tqtmain.cpp @ 336 – Rev 334 → 335