Renaming and playback/videoplayer to media player

c_plus_plus/src/steno/model/i_video_player.h → c_plus_plus/src/steno/model/i_media_player.h

@@ -1,5 +1,5 @@
-#ifndef I_VIDEO_PLAYER_H
-#define I_VIDEO_PLAYER_H
+#ifndef I_MEDIA_PLAYER_H
+#define I_MEDIA_PLAYER_H
 
 #include <QMediaPlayer>
 #include <QWidget>
@@ -9,13 +9,13 @@ class QVideoWidget;
 namespace Model
 {
 
-class IVideoPlayer : public QWidget
+class IMediaPlayer : public QWidget
 {
     Q_OBJECT
 
     public:
-        IVideoPlayer(QWidget *parent = nullptr) : QWidget(parent) {}
-        virtual ~IVideoPlayer() {}
+        IMediaPlayer(QWidget *parent = nullptr) : QWidget(parent) {}
+        virtual ~IMediaPlayer() {}
         virtual void setMedia(const QUrl &url) = 0;
         virtual void play() = 0;
         virtual void setPosition(int position) = 0;
@@ -33,4 +33,4 @@ class IVideoPlayer : public QWidget
 
 } // Model
 
-#endif // I_VIDEO_PLAYER_H
+#endif // I_MEDIA_PLAYER_H

c_plus_plus/src/steno/model/video_player.cpp → c_plus_plus/src/steno/model/media_player.cpp

@@ -1,12 +1,12 @@
-#include "video_player.h"
+#include "media_player.h"
 
 #include <QVideoWidget>
 
 namespace Model
 {
 
-VideoPlayer::VideoPlayer(QWidget *parent)
-    : IVideoPlayer(parent)
+MediaPlayer::MediaPlayer(QWidget *parent)
+    : IMediaPlayer(parent)
     , m_mediaPlayer(new QMediaPlayer(this, QMediaPlayer::VideoSurface))
 
 {
@@ -17,32 +17,32 @@ VideoPlayer::VideoPlayer(QWidget *parent)
     connect(m_mediaPlayer, QOverload<QMediaPlayer::Error>::of(&QMediaPlayer::error), [=]{ onErrorOccured(); });
 }
 
-VideoPlayer::~VideoPlayer()
+MediaPlayer::~MediaPlayer()
 {
     delete m_mediaPlayer;
 }
 
-void VideoPlayer::setVideoOutput(QVideoWidget *videoOutput)
+void MediaPlayer::setVideoOutput(QVideoWidget *videoOutput)
 {
     m_mediaPlayer->setVideoOutput(videoOutput);
 }
 
-void VideoPlayer::setVolume(int volume)
+void MediaPlayer::setVolume(int volume)
 {
     m_mediaPlayer->setVolume(volume);
 }
 
-int VideoPlayer::volume() const
+int MediaPlayer::volume() const
 {
     return m_mediaPlayer->volume();
 }
 
-void VideoPlayer::setMedia(const QUrl &url)
+void MediaPlayer::setMedia(const QUrl &url)
 {
     m_mediaPlayer->setMedia(url);
 }
 
-void VideoPlayer::play()
+void MediaPlayer::play()
 {
     switch (m_mediaPlayer->state())
     {
@@ -55,12 +55,12 @@ void VideoPlayer::play()
     }
 }
 
-void VideoPlayer::setPosition(int position)
+void MediaPlayer::setPosition(int position)
 {
     m_mediaPlayer->setPosition(position);
 }
 
-void VideoPlayer::onErrorOccured()
+void MediaPlayer::onErrorOccured()
 {
     const QString errorString = m_mediaPlayer->errorString();
     QString message = "Error: ";

c_plus_plus/src/steno/model/video_player.h → c_plus_plus/src/steno/model/media_player.h

@@ -1,7 +1,7 @@
-#ifndef VIDEO_PLAYER_H
-#define VIDEO_PLAYER_H
+#ifndef MEDIA_PLAYER_H
+#define MEDIA_PLAYER_H
 
-#include "model/i_video_player.h"
+#include "model/i_media_player.h"
 
 #include <QMediaPlayer>
 #include <QWidget>
@@ -11,11 +11,11 @@ class QUrl;
 namespace Model
 {
 
-class VideoPlayer : public IVideoPlayer
+class MediaPlayer : public IMediaPlayer
 {
     public:
-        explicit VideoPlayer(QWidget *parent = nullptr);
-        virtual ~VideoPlayer() override;
+        explicit MediaPlayer(QWidget *parent = nullptr);
+        virtual ~MediaPlayer() override;
         virtual void setMedia(const QUrl &url) override;
         virtual void play() override;
         virtual void setPosition(int position) override;
@@ -31,4 +31,4 @@ class VideoPlayer : public IVideoPlayer
 
 } // Model
 
-#endif // VIDEO_PLAYER_H
+#endif // MEDIA_PLAYER_H

c_plus_plus/src/steno/steno.pro

@@ -17,31 +17,31 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += \
     main.cpp \
-    model/video_player.cpp \
+    model/media_player.cpp \
     view/mainwindow.cpp \
     view/components/sidebar.cpp \
     view/views/conference_view.cpp \
-    view/views/playback_view.cpp \
+    view/views/media_player_view.cpp \
     view/views/recording_view.cpp \
     view/views/settings_view.cpp \
     view/views/transcription_view.cpp
 
 HEADERS += \
-    model/i_video_player.h \
-    model/video_player.h \
+    model/i_media_player.h \
+    model/media_player.h \
     view/mainwindow.h \
     view/components/sidebar.h \
     view/views/abstract_view.h \
     view/views/conference_view.h \
-    view/views/playback_view.h \
+    view/views/media_player_view.h \
     view/views/recording_view.h \
     view/views/settings_view.h \
     view/views/transcription_view.h
 
 FORMS += \
     view/gui/conference_view.ui \
     view/gui/mainwindow.ui \
-    view/gui/playback_view.ui \
+    view/gui/media_player_view.ui \
     view/gui/recording_view.ui \
     view/gui/settings_view.ui \
     view/gui/transcription_view.ui

c_plus_plus/src/steno/view/gui/playback_view.ui → c_plus_plus/src/steno/view/gui/media_player_view.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>PlaybackView</class>
- <widget class="QWidget" name="PlaybackView">
+ <class>MediaPlayerView</class>
+ <widget class="QWidget" name="MediaPlayerView">
   <property name="geometry">
    <rect>
     <x>0</x>

c_plus_plus/src/steno/view/mainwindow.cpp

@@ -9,11 +9,11 @@
 #include "view/views/abstract_view.h"
 #include "view/views/conference_view.h"
 #include "view/views/recording_view.h"
-#include "view/views/playback_view.h"
+#include "view/views/media_player_view.h"
 #include "view/views/transcription_view.h"
 #include "view/views/settings_view.h"
 
-#include "model/video_player.h"
+#include "model/media_player.h"
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -27,16 +27,16 @@ MainWindow::MainWindow(QWidget *parent)
 {
     ui->setupUi(this);
 
-    Model::VideoPlayer *videoPlayer = new Model::VideoPlayer();
-    playbackView = new View::PlaybackView(*videoPlayer);
+    Model::MediaPlayer *mediaPlayer = new Model::MediaPlayer();
+    mediaPlayerView = new View::MediaPlayerView(*mediaPlayer);
 
     QFile File("view/stylesheets/globalStylesheet.qss");
     File.open(QFile::ReadOnly);
     qApp->setStyleSheet(QLatin1String(File.readAll()));
 
     addView(conferenceView);
     addView(recordingView);
-    addView(playbackView);
+    addView(mediaPlayerView);
     addView(transcriptionView);
     addView(settingsView);
 

c_plus_plus/src/steno/view/mainwindow.h

@@ -26,7 +26,7 @@ class MainWindow : public QMainWindow
         QStackedWidget *views;
         View::AbstractView *conferenceView;
         View::AbstractView *recordingView;
-        View::AbstractView *playbackView;
+        View::AbstractView *mediaPlayerView;
         View::AbstractView *transcriptionView;
         View::AbstractView *settingsView;
 };

c_plus_plus/src/steno/view/views/playback_view.cpp → c_plus_plus/src/steno/view/views/media_player_view.cpp

@@ -1,7 +1,7 @@
-#include "playback_view.h"
-#include "ui_playback_view.h"
+#include "media_player_view.h"
+#include "ui_media_player_view.h"
 
-#include "model/i_video_player.h"
+#include "model/i_media_player.h"
 
 #include <QFileDialog>
 #include <QStandardPaths>
@@ -10,9 +10,9 @@
 namespace View
 {
 
-PlaybackView::PlaybackView(Model::IVideoPlayer &videoPlayer, QWidget *parent)
-    : AbstractView("Playback", parent)
-    , m_ui(new Ui::PlaybackView)
+MediaPlayerView::MediaPlayerView(Model::IMediaPlayer &videoPlayer, QWidget *parent)
+    : AbstractView("Media Player", parent)
+    , m_ui(new Ui::MediaPlayerView)
     , m_videoPlayer(videoPlayer)
 {
     m_ui->setupUi(this);
@@ -27,19 +27,19 @@ PlaybackView::PlaybackView(Model::IVideoPlayer &videoPlayer, QWidget *parent)
     connect(m_ui->positionSlider, &QAbstractSlider::sliderMoved, [=](int position){ m_videoPlayer.setPosition(position); });
     connect(m_ui->volumeSlider, &QSlider::valueChanged, [=]{ m_videoPlayer.setVolume(volume()); });
 
-    connect(&m_videoPlayer, &Model::IVideoPlayer::stateChanged, [=](QMediaPlayer::State state){ onMediaStateChanged(state); });
-    connect(&m_videoPlayer, &Model::IVideoPlayer::positionChanged, [=](qint64 position){ onPositionChanged(position); });
-    connect(&m_videoPlayer, &Model::IVideoPlayer::durationChanged, [=](qint64 duration){ onDurationChanged(duration); });
-    connect(&m_videoPlayer, &Model::IVideoPlayer::volumeChanged, [=](int volume){ setVolume(volume); });
-    connect(&m_videoPlayer, &Model::IVideoPlayer::errorOccured, [=](QString error){ onErrorOccured(error); });
+    connect(&m_videoPlayer, &Model::IMediaPlayer::stateChanged, [=](QMediaPlayer::State state){ onMediaStateChanged(state); });
+    connect(&m_videoPlayer, &Model::IMediaPlayer::positionChanged, [=](qint64 position){ onPositionChanged(position); });
+    connect(&m_videoPlayer, &Model::IMediaPlayer::durationChanged, [=](qint64 duration){ onDurationChanged(duration); });
+    connect(&m_videoPlayer, &Model::IMediaPlayer::volumeChanged, [=](int volume){ setVolume(volume); });
+    connect(&m_videoPlayer, &Model::IMediaPlayer::errorOccured, [=](QString error){ onErrorOccured(error); });
 }
 
-PlaybackView::~PlaybackView()
+MediaPlayerView::~MediaPlayerView()
 {
     delete m_ui;
 }
 
-void PlaybackView::onMediaStateChanged(QMediaPlayer::State state)
+void MediaPlayerView::onMediaStateChanged(QMediaPlayer::State state)
 {
     switch(state)
     {
@@ -52,23 +52,23 @@ void PlaybackView::onMediaStateChanged(QMediaPlayer::State state)
     }
 }
 
-void PlaybackView::onPositionChanged(qint64 position)
+void MediaPlayerView::onPositionChanged(qint64 position)
 {
     m_ui->positionSlider->setValue(static_cast<int>(position));
 }
 
-void PlaybackView::onDurationChanged(qint64 duration)
+void MediaPlayerView::onDurationChanged(qint64 duration)
 {
     m_ui->positionSlider->setRange(0, static_cast<int>(duration));
 }
 
-void PlaybackView::onErrorOccured(QString error)
+void MediaPlayerView::onErrorOccured(QString error)
 {
     m_ui->playButton->setEnabled(false);
     m_ui->errorLabel->setText(error);
 }
 
-void PlaybackView::openFile()
+void MediaPlayerView::openFile()
 {
     QFileDialog fileDialog(this);
     fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
@@ -83,7 +83,7 @@ void PlaybackView::openFile()
     }
 }
 
-int PlaybackView::volume() const
+int MediaPlayerView::volume() const
 {
     qreal linearVolume = QAudio::convertVolume(m_ui->volumeSlider->value() / qreal(100),
                                                QAudio::LogarithmicVolumeScale,
@@ -92,7 +92,7 @@ int PlaybackView::volume() const
     return qRound(linearVolume * 100);
 }
 
-void PlaybackView::setVolume(int volume)
+void MediaPlayerView::setVolume(int volume)
 {
     qreal logarithmicVolume = QAudio::convertVolume(volume / qreal(100),
                                                     QAudio::LinearVolumeScale,

c_plus_plus/src/steno/view/views/playback_view.h → c_plus_plus/src/steno/view/views/media_player_view.h

@@ -1,21 +1,21 @@
-#ifndef PLAYBACK_VIEW_H
-#define PLAYBACK_VIEW_H
+#ifndef MEDIA_PLAYER_VIEW_H
+#define MEDIA_PLAYER_VIEW_H
 
 #include <QMediaPlayer>
 
 #include "view/views/abstract_view.h"
 
-namespace Ui { class PlaybackView; }
-namespace Model { class IVideoPlayer; }
+namespace Ui { class MediaPlayerView; }
+namespace Model { class IMediaPlayer; }
 
 namespace View
 {
 
-class PlaybackView : public AbstractView
+class MediaPlayerView : public AbstractView
 {
     public:
-        explicit PlaybackView(Model::IVideoPlayer& videoPlayer, QWidget *parent = nullptr);
-        virtual ~PlaybackView();
+        explicit MediaPlayerView(Model::IMediaPlayer& videoPlayer, QWidget *parent = nullptr);
+        virtual ~MediaPlayerView();
 
     public slots:
         void onMediaStateChanged(QMediaPlayer::State state);
@@ -28,10 +28,10 @@ class PlaybackView : public AbstractView
         int volume() const;
         void setVolume(int);
 
-        Ui::PlaybackView *m_ui;
-        Model::IVideoPlayer &m_videoPlayer;
+        Ui::MediaPlayerView *m_ui;
+        Model::IMediaPlayer &m_videoPlayer;
 };
 
 } // View
 
-#endif // PLAYBACK_VIEW_H
+#endif // MEDIA_PLAYER_VIEW_H