From 1bd1b2bbcbe33f54c8dfdccdf94b2f862374e1dc Mon Sep 17 00:00:00 2001
From: Andrew Lee <alee14498@protonmail.com>
Date: Thu, 23 Jan 2020 17:57:50 -0500
Subject: Audio progress, flac support, about changed

---
 about.cpp  |  6 ++++
 about.ui   |  2 +-
 player.cpp | 29 +++++++++++++++----
 player.h   |  6 ++++
 player.ui  | 94 +++++++++++++++++++++++++++++++-------------------------------
 5 files changed, 84 insertions(+), 53 deletions(-)

diff --git a/about.cpp b/about.cpp
index 5bea58a..e3fde67 100644
--- a/about.cpp
+++ b/about.cpp
@@ -6,6 +6,12 @@ About::About(QWidget *parent) :
     ui(new Ui::About)
 {
     ui->setupUi(this);
+
+    ui->label_3->setTextFormat(Qt::RichText);
+
+    ui->label_3->setTextInteractionFlags(Qt::TextBrowserInteraction);
+
+    ui->label_3->setOpenExternalLinks(true);
 }
 
 About::~About()
diff --git a/about.ui b/about.ui
index e8751e5..ebe6256 100644
--- a/about.ui
+++ b/about.ui
@@ -78,7 +78,7 @@
    <item>
     <widget class="QLabel" name="label_3">
      <property name="text">
-      <string>Website: https://alee-productions.xyz</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://alee-productions.xyz&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;Website&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
diff --git a/player.cpp b/player.cpp
index e618afc..69fdd8a 100644
--- a/player.cpp
+++ b/player.cpp
@@ -6,13 +6,11 @@
 #include "ui_player.h"
 #include "about.h"
 
-
-
 void Player::mFileDialog()
 {
     QString mFile;
     QMessageBox msgbox;
-    mFile = QFileDialog::getOpenFileName(this, "Open any audio file", QDir::homePath(), tr("Audio Files (*.mp3 *.wav *.ogg)"));
+    mFile = QFileDialog::getOpenFileName(this, "Open any audio file", QDir::homePath(), tr("Audio Files (*.mp3 *.wav *.ogg *.flac)"));
     if (mFile == NULL) {
         qDebug() << "File cannot be found";
         msgbox.setWindowTitle("Uh oh! An error has occured!");
@@ -28,6 +26,7 @@ void Player::mFileDialog()
         msgbox.setIcon(QMessageBox::Information);
         msgbox.exec();
         ui->volumeSlider->setValue(100);
+        ui->playButton->setText(tr("Play"));
         return;
     }
 }
@@ -40,6 +39,9 @@ Player::Player(QWidget *parent)
 {
     ui->setupUi(this);
 
+    connect(mPlayer, &QMediaPlayer::positionChanged, this, &Player::on_positionChanged);
+    connect(mPlayer, &QMediaPlayer::durationChanged, this, &Player::on_durationChanged);
+
 }
 
 Player::~Player()
@@ -58,15 +60,17 @@ void Player::on_playButton_pressed()
 {
     ui->playbackSlider->setEnabled(true);
     ui->volumeSlider->setEnabled(true);
+
     if (mPlayer->state() == mPlayer->PlayingState) {
          qDebug() << "Pausing music...";
          mPlayer->pause();
-         ui->playButton->setText("Pause");
+         ui->playButton->setText(tr("Play"));
      } else {
          qDebug() << "Playing music...";
          mPlayer->play();
-         ui->playButton->setText("Play");
+         ui->playButton->setText(tr("Pause"));
      }
+
 }
 
 void Player::on_stopButton_pressed()
@@ -101,3 +105,18 @@ void Player::on_volumeSlider_sliderMoved(int position)
 {
     mPlayer->setVolume(position);
 }
+
+void Player::on_playbackSlider_sliderMoved(int position)
+{
+    mPlayer->setPosition(position);
+}
+
+void Player::on_positionChanged(qint64 position)
+{
+    ui->playbackSlider->setValue(position);
+}
+
+void Player::on_durationChanged(qint64 position)
+{
+    ui->playbackSlider->setMaximum(position);
+}
diff --git a/player.h b/player.h
index fae3e58..efecef9 100644
--- a/player.h
+++ b/player.h
@@ -34,6 +34,12 @@ private slots:
 
     void on_volumeSlider_sliderMoved(int position);
 
+    void on_playbackSlider_sliderMoved(int position);
+
+    void on_positionChanged(qint64 position);
+
+    void on_durationChanged(qint64 position);
+
 private:
     Ui::Player *ui;
 };
diff --git a/player.ui b/player.ui
index 4df7103..312c8d7 100644
--- a/player.ui
+++ b/player.ui
@@ -15,8 +15,28 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
-    <item row="3" column="0">
-     <spacer name="horizontalSpacer_5">
+    <item row="1" column="0" colspan="8">
+     <widget class="QSlider" name="playbackSlider">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="5">
+     <widget class="QPushButton" name="mediaButton">
+      <property name="text">
+       <string>Browse</string>
+      </property>
+      <property name="flat">
+       <bool>false</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="2">
+     <spacer name="horizontalSpacer_4">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
@@ -28,7 +48,7 @@
       </property>
      </spacer>
     </item>
-    <item row="5" column="5" colspan="3">
+    <item row="4" column="5" colspan="3">
      <widget class="QSlider" name="volumeSlider">
       <property name="enabled">
        <bool>false</bool>
@@ -47,13 +67,6 @@
       </property>
      </widget>
     </item>
-    <item row="6" column="5">
-     <widget class="QLabel" name="labelVolume">
-      <property name="text">
-       <string>Volume</string>
-      </property>
-     </widget>
-    </item>
     <item row="0" column="0" colspan="8">
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
@@ -88,31 +101,8 @@
       </widget>
      </widget>
     </item>
-    <item row="1" column="0" colspan="8">
-     <widget class="QSlider" name="playbackSlider">
-      <property name="enabled">
-       <bool>false</bool>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="2">
-     <spacer name="horizontalSpacer_4">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>40</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item row="3" column="7">
-     <spacer name="horizontalSpacer">
+    <item row="3" column="4">
+     <spacer name="horizontalSpacer_2">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
@@ -140,18 +130,21 @@
       </property>
      </widget>
     </item>
-    <item row="3" column="3">
-     <widget class="QPushButton" name="stopButton">
-      <property name="text">
-       <string>Stop</string>
+    <item row="3" column="7">
+     <spacer name="horizontalSpacer">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
       </property>
-      <property name="flat">
-       <bool>false</bool>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
       </property>
-     </widget>
+     </spacer>
     </item>
-    <item row="3" column="4">
-     <spacer name="horizontalSpacer_2">
+    <item row="3" column="0">
+     <spacer name="horizontalSpacer_5">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
@@ -163,10 +156,17 @@
       </property>
      </spacer>
     </item>
-    <item row="3" column="5">
-     <widget class="QPushButton" name="mediaButton">
+    <item row="5" column="5">
+     <widget class="QLabel" name="labelVolume">
       <property name="text">
-       <string>Browse</string>
+       <string>Volume</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="3">
+     <widget class="QPushButton" name="stopButton">
+      <property name="text">
+       <string>Stop</string>
       </property>
       <property name="flat">
        <bool>false</bool>
-- 
cgit v1.2.3