From a1ba1d2cd188ded5062a9cb8e389356072e7177e Mon Sep 17 00:00:00 2001
From: Andrea Odetti <mariofutire@gmail.com>
Date: Mon, 28 Dec 2020 20:00:16 +0000
Subject: [PATCH] Rename Video -> QVideo due to name clash.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
---
 source/frontends/qt/CMakeLists.txt            |  2 +-
 source/frontends/qt/emulator.cpp              |  5 ++
 source/frontends/qt/emulator.h                |  1 +
 source/frontends/qt/emulator.ui               |  6 +-
 source/frontends/qt/options.cpp               | 27 +++++----
 source/frontends/qt/qapple.cpp                | 15 +----
 source/frontends/qt/qapple.pro                |  4 +-
 source/frontends/qt/{video.cpp => qvideo.cpp} | 56 +++++++++++--------
 source/frontends/qt/{video.h => qvideo.h}     | 17 +++---
 9 files changed, 70 insertions(+), 63 deletions(-)
 rename source/frontends/qt/{video.cpp => qvideo.cpp} (82%)
 rename source/frontends/qt/{video.h => qvideo.h} (70%)

diff --git a/source/frontends/qt/CMakeLists.txt b/source/frontends/qt/CMakeLists.txt
index 13fae007..175ae351 100644
--- a/source/frontends/qt/CMakeLists.txt
+++ b/source/frontends/qt/CMakeLists.txt
@@ -15,7 +15,7 @@ add_executable(qapple
   emulator.cpp
   memorycontainer.cpp
   gamepadpaddle.cpp
-  video.cpp
+  qvideo.cpp
   configuration.cpp
   options.cpp
   loggingcategory.cpp
diff --git a/source/frontends/qt/emulator.cpp b/source/frontends/qt/emulator.cpp
index 109902bc..8ce36d62 100644
--- a/source/frontends/qt/emulator.cpp
+++ b/source/frontends/qt/emulator.cpp
@@ -44,6 +44,11 @@ bool Emulator::saveScreen(const QString & filename) const
     return ui->video->getScreen().save(filename);
 }
 
+void Emulator::loadVideoSettings()
+{
+    ui->video->loadVideoSettings();
+}
+
 void Emulator::displayLogo()
 {
     ui->video->displayLogo();
diff --git a/source/frontends/qt/emulator.h b/source/frontends/qt/emulator.h
index 3a89a61e..3a554827 100644
--- a/source/frontends/qt/emulator.h
+++ b/source/frontends/qt/emulator.h
@@ -22,6 +22,7 @@ public:
     void refreshScreen();   // just repaint
 
     bool saveScreen(const QString & filename) const;
+    void loadVideoSettings();
     void displayLogo();
 
     void setZoom(QMdiSubWindow * window, const int x);
diff --git a/source/frontends/qt/emulator.ui b/source/frontends/qt/emulator.ui
index b4837d83..3efb09a1 100644
--- a/source/frontends/qt/emulator.ui
+++ b/source/frontends/qt/emulator.ui
@@ -21,7 +21,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="Video" name="video" native="true">
+    <widget class="QVideo" name="video" native="true">
      <property name="minimumSize">
       <size>
        <width>560</width>
@@ -37,9 +37,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Video</class>
+   <class>QVideo</class>
    <extends>QWidget</extends>
-   <header>video.h</header>
+   <header>qvideo.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/source/frontends/qt/options.cpp b/source/frontends/qt/options.cpp
index c4e01506..8ebc2a43 100644
--- a/source/frontends/qt/options.cpp
+++ b/source/frontends/qt/options.cpp
@@ -14,7 +14,6 @@
 #include "Speaker.h"
 #include "Mockingboard.h"
 #include "Configuration/IPropertySheet.h"
-#include "Windows/WinVideo.h"
 
 #include <QMessageBox>
 #include <QGamepad>
@@ -223,11 +222,13 @@ void getAppleWinPreferences(PreferenceData & data)
         data.saveState = QString::fromStdString(saveState);
     }
 
-    data.videoType = GetVideoType();
-    data.scanLines = IsVideoStyle(VS_HALF_SCANLINES);
-    data.verticalBlend = IsVideoStyle(VS_COLOR_VERTICAL_BLEND);
-    data.hz50 = GetVideoRefreshRate() == VR_50HZ;
-    data.monochromeColor.setRgb(g_nMonochromeRGB);
+    Video & video = GetVideo();
+
+    data.videoType = video.GetVideoType();
+    data.scanLines = video.IsVideoStyle(VS_HALF_SCANLINES);
+    data.verticalBlend = video.IsVideoStyle(VS_COLOR_VERTICAL_BLEND);
+    data.hz50 = video.GetVideoRefreshRate() == VR_50HZ;
+    data.monochromeColor.setRgb(video.GetMonochromeRGB());
 }
 
 void setAppleWinPreferences(const PreferenceData & currentData, const PreferenceData & newData)
@@ -301,25 +302,27 @@ void setAppleWinPreferences(const PreferenceData & currentData, const Preference
     if (currentData.videoType != newData.videoType || currentData.scanLines != newData.scanLines || currentData.verticalBlend != newData.verticalBlend
             || currentData.hz50 != newData.hz50 || currentData.monochromeColor != newData.monochromeColor)
     {
+        Video & video = GetVideo();
+
         const VideoType_e videoType = VideoType_e(newData.videoType);
-        SetVideoType(videoType);
+        video.SetVideoType(videoType);
 
         VideoStyle_e videoStyle = VS_NONE;
         if (newData.scanLines)
             videoStyle = VideoStyle_e(videoStyle | VS_HALF_SCANLINES);
         if (newData.verticalBlend)
             videoStyle = VideoStyle_e(videoStyle | VS_COLOR_VERTICAL_BLEND);
-        SetVideoStyle(videoStyle);
+        video.SetVideoStyle(videoStyle);
 
         const VideoRefreshRate_e videoRefreshRate = newData.hz50 ? VR_50HZ : VR_60HZ;
-        SetVideoRefreshRate(videoRefreshRate);
+        video.SetVideoRefreshRate(videoRefreshRate);
 
         const QColor color = newData.monochromeColor;
         // be careful QRgb is opposite way round to COLORREF
-        g_nMonochromeRGB = RGB(color.red(), color.green(), color.blue());
+        video.SetMonochromeRGB(RGB(color.red(), color.green(), color.blue()));
 
-        Config_Save_Video();
-        VideoReinitialize();
+        video.Config_Save_Video();
+        video.VideoReinitialize();
         GetFrame().VideoRedrawScreen();
     }
 
diff --git a/source/frontends/qt/qapple.cpp b/source/frontends/qt/qapple.cpp
index bf90e92a..429788ea 100644
--- a/source/frontends/qt/qapple.cpp
+++ b/source/frontends/qt/qapple.cpp
@@ -111,6 +111,7 @@ namespace
         GetVideo().Initialize();
         VideoSwitchVideocardPalette(RGB_GetVideocard(), GetVideo().GetVideoType());
 
+        emulator->loadVideoSettings();
         emulator->displayLogo();
 
         GetCardMgr().GetDisk2CardMgr().Reset();
@@ -151,20 +152,6 @@ namespace
 
 }
 
-void FrameDrawDiskLEDS(HDC)
-{
-}
-
-void FrameDrawDiskStatus(HDC)
-{
-
-}
-
-void FrameRefreshStatus(int, bool)
-{
-
-}
-
 // MessageBox
 
 int MessageBox(HWND, const char * text, const char * caption, UINT type)
diff --git a/source/frontends/qt/qapple.pro b/source/frontends/qt/qapple.pro
index d9ff6f4c..321d2140 100644
--- a/source/frontends/qt/qapple.pro
+++ b/source/frontends/qt/qapple.pro
@@ -30,7 +30,7 @@ SOURCES += main.cpp\
     qresources.cpp \
     emulator.cpp \
     configuration.cpp \
-    video.cpp \
+    qvideo.cpp \
     memorycontainer.cpp \
     preferences.cpp \
     gamepadpaddle.cpp \
@@ -54,7 +54,7 @@ HEADERS  += qapple.h \
     options.h \
     qdirectsound.h \
     configuration.h \
-    video.h \
+    qvideo.h \
     memorycontainer.h \
     preferences.h \
     gamepadpaddle.h \
diff --git a/source/frontends/qt/video.cpp b/source/frontends/qt/qvideo.cpp
similarity index 82%
rename from source/frontends/qt/video.cpp
rename to source/frontends/qt/qvideo.cpp
index 3aaeb8f7..37a9bf21 100644
--- a/source/frontends/qt/video.cpp
+++ b/source/frontends/qt/qvideo.cpp
@@ -1,4 +1,4 @@
-#include "video.h"
+#include "qvideo.h"
 
 #include <QPainter>
 #include <QKeyEvent>
@@ -11,28 +11,36 @@
 #include "MouseInterface.h"
 #include "Core.h"
 #include "Video.h"
+#include "Interface.h"
 
-Video::Video(QWidget *parent) : VIDEO_BASECLASS(parent)
+QVideo::QVideo(QWidget *parent) : QVIDEO_BASECLASS(parent)
 {
-    setMouseTracking(true);
+    this->setMouseTracking(true);
 
     myLogo = QImage(":/resources/APPLEWINLOGO.BMP").mirrored(false, true);
-
-    mySX = GetFrameBufferBorderWidth();
-    mySY = GetFrameBufferBorderHeight();
-    mySW = GetFrameBufferBorderlessWidth();
-    mySH = GetFrameBufferBorderlessHeight();
-    myWidth = GetFrameBufferWidth();
-    myHeight = GetFrameBufferHeight();
 }
 
-QImage Video::getScreenImage() const
+void QVideo::loadVideoSettings()
 {
-    QImage frameBuffer(g_pFramebufferbits, myWidth, myHeight, QImage::Format_ARGB32_Premultiplied);
+    Video & video = GetVideo();
+
+    mySX = video.GetFrameBufferBorderWidth();
+    mySY = video.GetFrameBufferBorderHeight();
+    mySW = video.GetFrameBufferBorderlessWidth();
+    mySH = video.GetFrameBufferBorderlessHeight();
+    myWidth = video.GetFrameBufferWidth();
+    myHeight = video.GetFrameBufferHeight();
+
+    myFrameBuffer = video.GetFrameBuffer();
+}
+
+QImage QVideo::getScreenImage() const
+{
+    QImage frameBuffer(myFrameBuffer, myWidth, myHeight, QImage::Format_ARGB32_Premultiplied);
     return frameBuffer;
 }
 
-QImage Video::getScreen() const
+QImage QVideo::getScreen() const
 {
     QImage frameBuffer = getScreenImage();
     QImage screen = frameBuffer.copy(mySX, mySY, mySW, mySH);
@@ -40,7 +48,7 @@ QImage Video::getScreen() const
     return screen;
 }
 
-void Video::displayLogo()
+void QVideo::displayLogo()
 {
     QImage frameBuffer = getScreenImage();
 
@@ -48,7 +56,7 @@ void Video::displayLogo()
     painter.drawImage(mySX, mySY, myLogo);
 }
 
-void Video::paintEvent(QPaintEvent *)
+void QVideo::paintEvent(QPaintEvent *)
 {
     QImage frameBuffer = getScreenImage();
 
@@ -68,7 +76,7 @@ void Video::paintEvent(QPaintEvent *)
     }
 }
 
-bool Video::event(QEvent *event)
+bool QVideo::event(QEvent *event)
 {
     if (isEnabled() && (event->type() == QEvent::KeyPress))
     {
@@ -82,11 +90,11 @@ bool Video::event(QEvent *event)
     }
     else
     {
-        return VIDEO_BASECLASS::event(event);
+        return QVIDEO_BASECLASS::event(event);
     }
 }
 
-void Video::keyReleaseEvent(QKeyEvent *event)
+void QVideo::keyReleaseEvent(QKeyEvent *event)
 {
     if (!event->isAutoRepeat())
     {
@@ -104,10 +112,10 @@ void Video::keyReleaseEvent(QKeyEvent *event)
         }
     }
 
-    VIDEO_BASECLASS::keyReleaseEvent(event);
+    QVIDEO_BASECLASS::keyReleaseEvent(event);
 }
 
-void Video::keyPressEvent(QKeyEvent *event)
+void QVideo::keyPressEvent(QKeyEvent *event)
 {
     const int key = event->key();
 
@@ -197,11 +205,11 @@ void Video::keyPressEvent(QKeyEvent *event)
     }
     else
     {
-        VIDEO_BASECLASS::keyPressEvent(event);
+        QVIDEO_BASECLASS::keyPressEvent(event);
     }
 }
 
-void Video::mouseMoveEvent(QMouseEvent *event)
+void QVideo::mouseMoveEvent(QMouseEvent *event)
 {
     CardManager & cardManager = GetCardMgr();
 
@@ -228,7 +236,7 @@ void Video::mouseMoveEvent(QMouseEvent *event)
     }
 }
 
-void Video::mousePressEvent(QMouseEvent *event)
+void QVideo::mousePressEvent(QMouseEvent *event)
 {
     CardManager & cardManager = GetCardMgr();
 
@@ -250,7 +258,7 @@ void Video::mousePressEvent(QMouseEvent *event)
     }
 }
 
-void Video::mouseReleaseEvent(QMouseEvent *event)
+void QVideo::mouseReleaseEvent(QMouseEvent *event)
 {
     CardManager & cardManager = GetCardMgr();
 
diff --git a/source/frontends/qt/video.h b/source/frontends/qt/qvideo.h
similarity index 70%
rename from source/frontends/qt/video.h
rename to source/frontends/qt/qvideo.h
index 0486781c..c6081717 100644
--- a/source/frontends/qt/video.h
+++ b/source/frontends/qt/qvideo.h
@@ -1,18 +1,19 @@
-#ifndef VIDEO_H
-#define VIDEO_H
+#ifndef QVIDEO_H
+#define QVIDEO_H
 
 #include <QOpenGLWidget>
 
-#define VIDEO_BASECLASS QOpenGLWidget
-//#define VIDEO_BASECLASS QWidget
+#define QVIDEO_BASECLASS QOpenGLWidget
+//#define QVIDEO_BASECLASS QWidget
 
-class Video : public VIDEO_BASECLASS
+class QVideo : public QVIDEO_BASECLASS
 {
     Q_OBJECT
 public:
-    explicit Video(QWidget *parent = nullptr);
+    explicit QVideo(QWidget *parent = nullptr);
 
     QImage getScreen() const;
+    void loadVideoSettings();
     void displayLogo();
 
 signals:
@@ -39,7 +40,9 @@ private:
     int myWidth;
     int myHeight;
 
+    quint8 * myFrameBuffer;
+
     QImage getScreenImage() const;
 };
 
-#endif // VIDEO_H
+#endif // QVIDEO_H