Fix issues in Media Tab and Settings Dialog for Qt6 compatibility

src/headers/generalsettingwidget.hpp

@@ -40,13 +40,12 @@ class GeneralSettingWidget : public QWidget
 private:
     Ui::GeneralSettingWidget *ui;
     GeneralSettings mySettings;
-    Settings allSetings;
     QStringList monitors;
     QStringList themes;
     QList<int> themeIdList;
 
 public slots:
-    void setSettings(GeneralSettings settings);
+    void setSettings(GeneralSettings sets);
     void updateSecondaryDisplayScreen();
     GeneralSettings getSettings();
 

src/headers/mediacontrol.hpp

@@ -42,6 +42,8 @@ public slots:
     void updateTime(qint64 time);
     void setMaximumTime(qint64 maxTime);
     void updatePlayerState(QMediaPlayer::PlaybackState state);
+    QMediaPlayer::PlaybackState playbackState() const { return mPlayerState; }
+    bool isMuted() const;
 
 signals:
     void volumeChanged(int);
@@ -55,10 +57,13 @@ private slots:
     void on_pushButtonStop_clicked();
     void on_pushButtonPlayPause_clicked();
     void on_pushButtonMute_toggled(bool checked);
+    void on_horizontalSliderTime_sliderPressed();
     void on_horizontalSliderTime_sliderReleased();
     void on_horizontalSliderVolume_sliderMoved(int position);
 
 
+protected:
+    bool eventFilter(QObject *obj, QEvent *event) override;
 
 private:
     Ui::MediaControl *ui;
@@ -69,6 +74,9 @@ private slots:
     QIcon mPauseIcon;
     QIcon mMuteIcon;
     QIcon mUnmuteIcon;
+
+    bool mIsSeeking = false;
+    QString m_lastTimeString;
 };
 
 #endif // MEDIACONTROL_HPP

src/headers/mediawidget.hpp

@@ -22,6 +22,7 @@
 
 #include <QtWidgets>
 #include <QMediaPlayer>
+#include <QAudioOutput>
 #include <QtSql>
 //#include <phonon>
 //#include <phonon/MediaObject>
@@ -51,6 +52,7 @@ public slots:
     void setMediaFromSchedule(VideoInfo &v);
     void goLiveFromSchedule();
     bool isValidMedia();
+    void stopVideo();
 protected:
     void dragEnterEvent(QDragEnterEvent *e);
     void dragMoveEvent(QDragMoveEvent *e);
@@ -87,6 +89,7 @@ private slots:
     QIcon unmuteIcon;
 
     QMediaPlayer *player;
+    QAudioOutput *audioOutput;
     VideoPlayerWidget *videoWidget;
     MediaControl *mediaControls;
 
@@ -99,6 +102,8 @@ private slots:
     QUrl currentMediaUrl;
 
     bool isReadyToPlay;
+    bool m_autoGoLiveAfterLoad = false;
+    qint64 lastReportedPosition = 0;
 };
 
 #endif // MEDIAWIDGET_HPP

src/headers/projectordisplayscreen.hpp

@@ -51,7 +51,8 @@ public slots:
     void resetImGenSize();
 
     void renderNotText();
-    void renderPassiveText(QPixmap &back,bool useBack);
+    void setPassiveBackground(QPixmap pix);
+    void renderPassiveText(QPixmap pix,bool useBack);
     void renderBibleText(Verse bVerse, BibleSettings &bSets);
     void renderSongText(Stanza stanza, SongSettings &sSets);
     void renderAnnounceText(AnnounceSlide announce, TextSettings &aSets);
@@ -65,8 +66,7 @@ public slots:
     void setVideoMuted(bool muted);
     void setVideoPosition(qint64 position);
 
-    void positionControls(DisplayControlsSettings & dSettings);
-    void setControlsVisible(bool visible);
+    void setAudioEnabled(bool enabled);
 
 private slots:
     void setBackPixmap(QPixmap p,int fillMode); // 0 = Strech, 1 = keep aspect, 2 = keep aspect by expanding
@@ -101,6 +101,7 @@ private slots:
 private:
     Ui::ProjectorDisplayScreen *ui;
     QQuickView *dispView;
+    QWidget *m_videoWidget;
     SpImageProvider *imProvider;
     ImageGenerator imGen;
     bool backImSwitch1, textImSwitch1, backImSwitch2, textImSwitch2;
@@ -110,6 +111,7 @@ private slots:
    // DisplayControlsSettings mySettings;
 
     QPixmap back;
+    QPixmap m_passiveBack;
 };
 
 #endif // PROJECTORDISPLAYSCREEN_HPP

src/headers/softprojector.hpp

@@ -86,8 +86,6 @@ class SoftProjector : public QMainWindow
     Theme theme;
     Settings mySettings;
 
-    SoftProjector *softProjector;
-
 public slots:
     void updateSetting(GeneralSettings &g,Theme &t, SlideShowSettings &ssets,
                        BibleVersionSettings &bsets, BibleVersionSettings &bsets2,
@@ -201,6 +199,7 @@ private slots:
     void on_actionPrint_triggered();
     void on_actionPrintSchedule_triggered();
 
+    void exitProjector();
     void nextSlide();
     void prevSlide();
 

src/headers/videoinfo.hpp

@@ -31,6 +31,7 @@ class VideoInfo
     QUrl filePath;
     QString fileName;
     int aspectRatio;
+    bool hasVideo;
 };
 
 #endif // VIDEOINFO_HPP