Deprecate QUICKTIME and AV support

They are not working from long time ago, VIDEO options
for macOS now are the same as for Linux and Windows.

src/Gui/GcCrashDialog.cpp

@@ -37,11 +37,7 @@
 #define COMPILER_VERSION QString("%1").arg(_MSC_VER)
 #endif
 
-#if defined(GC_VIDEO_AV) || defined(GC_VIDEO_QUICKTIME)
-#include "QtMacVideoWindow.h"
-#else
 #include "VideoWindow.h"
-#endif
 
 #ifdef GC_HAVE_ICAL
 #include "ICalendar.h"
@@ -282,9 +278,7 @@ QString GcCrashDialog::versionHTML()
             .arg(usbxpress)
             .arg(libusb)
             .arg(vlc)
-#if defined GC_VIDEO_QUICKTIME
-            .arg("quicktime")
-#elif defined GC_VIDEO_QT5
+#if defined GC_VIDEO_QT5
             .arg("qt5")
 #elif defined GC_VIDEO_QT6
             .arg("qt6")

src/Gui/GcWindowRegistry.cpp

@@ -29,11 +29,7 @@
 #endif
 #include "HistogramWindow.h"
 #include "LTMWindow.h"
-#if defined(GC_VIDEO_AV) || defined(GC_VIDEO_QUICKTIME)
-#include "QtMacVideoWindow.h"
-#else
 #include "VideoWindow.h"
-#endif
 #include "PfPvWindow.h"
 #include "HrPwWindow.h"
 #include "RideEditor.h"

src/Train/Library.cpp

@@ -31,11 +31,7 @@
 #include <QFileInfo>
 
 // helpers
-#if defined(GC_VIDEO_AV) || defined(GC_VIDEO_QUICKTIME)
-#include "QtMacVideoWindow.h"
-#else
 #include "VideoWindow.h"
-#endif
 
 #include "ErgFile.h"
 #include "VideoSyncFile.h"

src/Train/TrainSidebar.cpp

@@ -65,11 +65,7 @@
 #endif
 
 // Media selection helper
-#if defined(GC_VIDEO_AV) || defined(GC_VIDEO_QUICKTIME)
-#include "QtMacVideoWindow.h"
-#else
 #include "VideoWindow.h"
-#endif
 #ifdef Q_OS_MAC
 #include <CoreServices/CoreServices.h>
 #include <QStyle>

src/Train/VideoWindow.h

@@ -27,9 +27,9 @@
 //
 // Options are, GC_VIDEO_xxxx where xxxx is one of:
 // GC_VIDEO_VLC
-// GC_VIDEO_QUICKTIME
 // GC_VIDEO_NONE
 // GC_VIDEO_QT5
+// GC_VIDEO_QT6
 //
 // If the user hasn't set one of the above then we determine
 // which one should apply !
@@ -39,9 +39,9 @@
 //----------------------------------------------------------------------
 #ifdef Q_OS_MAC
 
-// if we aint chosen one or the other then use quicktime
-#if !defined GC_VIDEO_QUICKTIME && !defined GC_VIDEO_NONE && !defined GC_VIDEO_QT5 && !defined GC_VIDEO_QT6 && !defined GC_VIDEO_VLC
-#define GC_VIDEO_QUICKTIME
+// if we aint chosen one or the other then use none
+#if !defined GC_VIDEO_NONE && !defined GC_VIDEO_QT5 && !defined GC_VIDEO_QT6 && !defined GC_VIDEO_VLC
+#define GC_VIDEO_NONE
 #endif
 
 // but qt5 and vlc are not experimental options !
@@ -69,18 +69,18 @@
 #endif
 #endif
 
-// if we aint chosen one or the other then use QT5
+// if we aint chosen one then use none
 #if !defined GC_VIDEO_NONE && !defined GC_VIDEO_QT5 && !defined GC_VIDEO_QT6 && !defined GC_VIDEO_VLC
-#define GC_VIDEO_QT5
-#endif
-
-// now check for stupid settings
-#if defined GC_VIDEO_QUICKTIME
-#error "QuickTime is only supported on Mac OS X"
+#define GC_VIDEO_NONE
 #endif
 
 #endif // Q_OS_LINUX || Q_OS_WIN
 
+// now check for stupid settings
+#if defined GC_VIDEO_QT6 && QT_VERSION < 0x060000
+#error "Qt6 Video is not supported on Qt5"
+#endif
+
 //----------------------------------------------------------------------
 // Now options are set lets pull in the headers we need then
 //----------------------------------------------------------------------

src/gcconfig.pri.in

@@ -244,11 +244,9 @@ macx {
 
 # What video playback do you want?
 DEFINES += GC_VIDEO_NONE             # dont add any video playback support
-#DEFINES += GC_VIDEO_QUICKTIME       # mac only and the default
 #DEFINES += GC_VIDEO_QT5             # use QT5 qvideowidget if QT > 5.2.1
 #DEFINES += GC_VIDEO_QT6             # qt6 videowidget
 #DEFINES += GC_VIDEO_VLC             # use VideoLan library needs VLC_INSTALL defined above
-#DEFINES += GC_VIDEO_AV              # use AV Foundation on Mac now QTKit is deprecated
 
 
 # Using the GoldenCheetah/CloudDB feature (with a private CloudDB instance)

src/src.pro

@@ -148,33 +148,12 @@ macx {
     # on mac we use native buttons and video, but have native fullscreen support
     LIBS    += -lobjc -framework IOKit -framework AppKit
 
-    # on mac we use QTKit or AV Foundation
-    contains(DEFINES, "GC_VIDEO_AV") {
-
-        # explicitly wants AV Foundation
-        LIBS += -framework AVFoundation
-        HEADERS +=  Gui/QtMacVideoWindow.h
-        OBJECTIVE_SOURCES += Gui/QtMacVideoWindow.mm
-
-    } else {
-
-        !contains(DEFINES, "GC_VIDEO_QUICKTIME") {
-
-            # GC_VIDEO_QT5 will enable Qt5 video support,
-            # GC_VIDEO_VLC will enable VLC video support,
-            # otherwise we have a blank videowindow, it will do nothing
-            HEADERS += Train/VideoWindow.h
-            SOURCES += Train/VideoWindow.cpp
-
-        } else {
-
-            # default is to use QuickTime for now
-            LIBS += -framework QTKit
-            HEADERS +=  Gui/QtMacVideoWindow.h
-            OBJECTIVE_SOURCES += Gui/QtMacVideoWindow.mm
-
-        }
-    }
+    # GC_VIDEO_QT5 will enable Qt5 video support,
+    # GC_VIDEO_QT6 will enable Qt6 video support,
+    # GC_VIDEO_VLC will enable VLC video support,
+    # otherwise we have a blank videowindow, it will do nothing
+    HEADERS += Train/VideoWindow.h
+    SOURCES += Train/VideoWindow.cpp
 
 } else {