possible fix for memory leak

fixed missing include, added build folder to gitignore
fixed recievcer state off after longer runtime
2022-07-20 15:43:45 +02:00 · 2019-09-06 13:07:51 +02:00 · 2018-12-23 18:37:56 +01:00 · 2018-11-18 00:34:50 +01:00 · 2018-11-17 23:06:09 +01:00 · 2018-11-17 22:30:04 +01:00
9 changed files with 274 additions and 130 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,6 @@ Makefile*
 *.qmlproject.user
 *.qmlproject.user.*

+# build
+build*
+
--- a/README.md
+++ b/README.md
@@ -1,2 +1,8 @@
 # yremote

+Simple PC remote for yamaha recievers.
+
+
+![](https://i.imgur.com/Nux4CNN.png)
+
+Only tested with RX-V475.
--- a/main.cpp
+++ b/main.cpp
@@ -6,6 +6,9 @@ using namespace yremote;
 int main(int argc, char *argv[])
 {
    QApplication a(argc, argv);
+    QCoreApplication::setOrganizationName("RogoSoftware");
+    QCoreApplication::setOrganizationDomain("git.rogocloud.eu");
+    QCoreApplication::setApplicationName("yremote");
    MainWindow w;
    w.show();

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,33 +1,53 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"

+#include <QFile>
 #include <QTimer>
 #include <QtNetwork/QNetworkReply>
+#include <QRegularExpression>

 class QNetworkReply;
 namespace yremote {

 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
 {
-    QString DEFAULT_ADDRESS = "10.0.0.227";
-
    ui->setupUi(this);
    setFixedSize(size());
-    ui->txt_address->setText(DEFAULT_ADDRESS);
+#if defined(Q_OS_WIN)
+    setWindowFlags(windowFlags() | Qt::MSWindowsFixedSizeDialogHint);
+#endif
+
+    mSettings = new QSettings(QSettings::IniFormat, QSettings::UserScope, "RogoSoftware", "yremote");
+    mNetworkManager = new QNetworkAccessManager(this);
+
+    restoreGeometry(mSettings->value("geometry", saveGeometry()).toByteArray());
+    move(mSettings->value("pos", pos()).toPoint());
+
+    ui->txt_address->setText(mSettings->value("av_address", "").toString());
    mAddress = ui->txt_address->text();

-    connect(&mTimer, &QTimer::timeout, this, &MainWindow::sendVolume);
-    mTimer.setSingleShot(true);
+    // setup volume value collection
+    connect(&mTimerValCollect, &QTimer::timeout, this, &MainWindow::sendVolume);
+    mTimerValCollect.setSingleShot(true);

-    // load initial data
-    sendCommand("<YAMAHA_AV cmd=\"GET\"><System><Power_Control><Power>GetParam</Power></Power_Control></System></YAMAHA_AV>");
-    sendCommand("<YAMAHA_AV cmd=\"GET\"><Main_Zone><Volume><Lvl>GetParam</Lvl></Volume></Main_Zone></YAMAHA_AV>");
-    sendCommand("<YAMAHA_AV cmd=\"GET\"><Main_Zone><Input><Input_Sel>GetParam</Input_Sel></Input></Main_Zone></YAMAHA_AV>");
+    connect(&mTimerUpdateAddress, &QTimer::timeout, this, &MainWindow::updateAVState);
+    mTimerUpdateAddress.setSingleShot(true);
+
+    // load initial data and set update rate
+    updateAVState();
+    connect(&mTimerUpdateState, &QTimer::timeout, this, &MainWindow::updateAVState);
+    mTimerUpdateState.start(TIME_UPDATE_STATE);
+
+    QFile css(":style.css");
+    if (css.open(QFile::ReadOnly | QFile::Text))
+        this->setStyleSheet(css.readAll());
 }

 MainWindow::~MainWindow()
 {
    delete ui;
+    delete mSettings;
+    delete mNetworkManager;
 }

 void MainWindow::sendCommand(QString cmd)
@@ -37,27 +57,25 @@ void MainWindow::sendCommand(QString cmd)
    request.setRawHeader("Content-Type", "text/xml; charset=UTF-8");
    request.setRawHeader("Content-Length", QByteArray::number(cmd.size()));

-    QNetworkAccessManager *networkManager = new QNetworkAccessManager(this);
-    networkManager->post(request, cmd.toUtf8());
-    connect(networkManager, &QNetworkAccessManager::finished, this, &MainWindow::replyFinished);
+    mNetworkManager->post(request, cmd.toUtf8());
+    connect(mNetworkManager, &QNetworkAccessManager::finished, this, &MainWindow::replyFinished);
 }

 void MainWindow::replyFinished(QNetworkReply* reply)
 {
-    QString ans;
-
    if(reply->error() == QNetworkReply::NoError) {
        QByteArray data = reply->readAll();
-        ans = QString(data);
+        mAnswer = QString(data);
    } else {
        qDebug() << reply->url();
        qDebug() << reply->errorString();
-        return;
+
+        mPowered = false;
    }

    // check power state
    QRegularExpression regexPower("<Power_Control><Power>(.+)</Power></Power_Control>");
-    QRegularExpressionMatch matchPower = regexPower.match(ans);
+    QRegularExpressionMatch matchPower = regexPower.match(mAnswer);
    if (matchPower.hasMatch()) {
        if (matchPower.captured(1) == "On") mPowered = true;
        else if (matchPower.captured(1) == "Off") mPowered = false;
@@ -65,14 +83,14 @@ void MainWindow::replyFinished(QNetworkReply* reply)

    // check volume
    QRegularExpression regexVolume("<Volume><Lvl><Val>(.+)</Val>");
-    QRegularExpressionMatch matchVolume = regexVolume.match(ans);
+    QRegularExpressionMatch matchVolume = regexVolume.match(mAnswer);
    if (matchVolume.hasMatch()) {
        mVolume = matchVolume.captured(1).toInt();
    }

    // check input
    QRegularExpression regexInput("<Input><Input_Sel>(.+)</Input_Sel>");
-    QRegularExpressionMatch matchInput = regexInput.match(ans);
+    QRegularExpressionMatch matchInput = regexInput.match(mAnswer);
    if (matchInput.hasMatch())
        mInput = matchInput.captured(1);

@@ -92,15 +110,7 @@ void MainWindow::updateUi() {
    ui->btn_audioin->setEnabled(mPowered);

    setActiveButton(mInput);
-
-    if (mPowered) {
-        ui->btn_onoff->setText("On");
-        ui->btn_onoff->setStyleSheet("background-color: SpringGreen");
-    } else {
-        ui->btn_onoff->setText("Off");
-        ui->btn_onoff->setStyleSheet("background-color: DarkRed");
-        setActiveButton("");
-    }
+    setPowerState();
 }

 void MainWindow::setActiveButton(QString prop)
@@ -109,16 +119,34 @@ void MainWindow::setActiveButton(QString prop)
        QPushButton *b = dynamic_cast<QPushButton*>(q);
        if (b){
            if (b->property("input") == prop)
-                b->setStyleSheet("background-color: SpringGreen");
+                b->setStyleSheet("background-color: #24e895; color: #404040;");
            else
                b->setStyleSheet("");
        }
    }
 }

+void MainWindow::setPowerState()
+{
+    if (mPowered) {
+        ui->btn_onoff->setText("On");
+        ui->btn_onoff->setStyleSheet("background-color: #24e895; color: #404040;");
+        ui->lbl_volume->setStyleSheet("color: #24e895");
+        ui->dial->setStyleSheet("background-color: #24e895");
+    } else {
+        ui->btn_onoff->setText("Off");
+        ui->btn_onoff->setStyleSheet("");
+        ui->lbl_volume->setStyleSheet("");
+        ui->dial->setStyleSheet("");
+        setActiveButton("");
+    }
+}
+
 void MainWindow::on_txt_address_textEdited(const QString &arg1)
 {
    mAddress = arg1;
+    mSettings->setValue("av_address", mAddress);
+    mTimerUpdateAddress.start(TIME_UPDATE_ADDRESS);
 }

 void MainWindow::on_btn_onoff_clicked()
@@ -146,7 +174,7 @@ void MainWindow::on_dial_valueChanged(int value)

    ui->lbl_volume->setText(QString::number(value));
    mVolume = value;
-    mTimer.start(WAITTIME);
+    mTimerValCollect.start(TIME_VOL_COLLECT);
 }

 void MainWindow::sendVolume()
@@ -156,6 +184,19 @@ void MainWindow::sendVolume()
                + "</Val><Exp>1</Exp><Unit>dB</Unit></Lvl></Volume></Main_Zone></YAMAHA_AV>");
 }

+void MainWindow::moveEvent(QMoveEvent *)
+{
+    mSettings->setValue("geometry", geometry());
+    mSettings->setValue("pos", pos());
+}
+
+void MainWindow::updateAVState()
+{
+    sendCommand("<YAMAHA_AV cmd=\"GET\"><System><Power_Control><Power>GetParam</Power></Power_Control></System></YAMAHA_AV>");
+    sendCommand("<YAMAHA_AV cmd=\"GET\"><Main_Zone><Volume><Lvl>GetParam</Lvl></Volume></Main_Zone></YAMAHA_AV>");
+    sendCommand("<YAMAHA_AV cmd=\"GET\"><Main_Zone><Input><Input_Sel>GetParam</Input_Sel></Input></Main_Zone></YAMAHA_AV>");
+}
+
 void MainWindow::on_btn_hdmi1_clicked()
 {
    sendCommand("<YAMAHA_AV cmd=\"PUT\"><Main_Zone><Input><Input_Sel>HDMI1</Input_Sel></Input></Main_Zone></YAMAHA_AV>");
@@ -182,7 +223,6 @@ void MainWindow::on_btn_spotify_clicked()

 void MainWindow::on_btn_airplay_clicked()
 {
-    // TODO
    sendCommand("<YAMAHA_AV cmd=\"PUT\"><Main_Zone><Input><Input_Sel>IPOD</Input_Sel></Input></Main_Zone></YAMAHA_AV>");
    mInput = "IPOD";
 }
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -2,6 +2,7 @@
 #define MAINWINDOW_H

 #include <QMainWindow>
+#include <QSettings>
 #include <QTimer>
 #include "QtNetwork/QNetworkAccessManager"

@@ -16,8 +17,11 @@ class MainWindow : public QMainWindow
    Q_OBJECT

 public:
-    explicit MainWindow(QWidget *parent = 0);
-    ~MainWindow();
+    explicit MainWindow(QWidget *parent = nullptr);
+    ~MainWindow() override;
+
+    void setPowerState();
+    void updateAVState();

 private slots:
    void on_btn_onoff_clicked();
@@ -35,18 +39,30 @@ private slots:
 private:
    Ui::MainWindow *ui;

-    QString mAddress;
-    QTimer mTimer;
    bool mPowered = false;
    int mVolume = 0;
    QString mInput;
-    const int WAITTIME = 400;
+    const int TIME_VOL_COLLECT = 400;
+    const int TIME_UPDATE_STATE = 10000;
+    const int TIME_UPDATE_ADDRESS = 1000;
+
+    QString mAddress;
+    QTimer mTimerValCollect;
+    QTimer mTimerUpdateState;
+    QTimer mTimerUpdateAddress;
+    QSettings* mSettings = nullptr;
+    QNetworkAccessManager *mNetworkManager = nullptr;
+    QString mAnswer;

    void sendCommand(QString cmd);
    void updateUi();
+    void setActiveButton(QString prop);
    void sendVolume();

-    void setActiveButton(QString prop);
+    // QWidget interface
+protected:
+    void moveEvent(QMoveEvent *) override;
+
 };

 }
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>359</width>
-    <height>161</height>
+    <height>170</height>
   </rect>
  </property>
  <property name="contextMenuPolicy">
@@ -16,105 +16,21 @@
  <property name="windowTitle">
   <string>yremote</string>
  </property>
-  <widget class="QWidget" name="centralWidget">
+  <property name="autoFillBackground">
+   <bool>false</bool>
+  </property
+  ><widget class="QWidget" name="centralWidget">
   <layout class="QGridLayout" name="gridLayout">
-    <item row="1" column="0">
-     <widget class="QPushButton" name="btn_onoff">
-      <property name="text">
-       <string>On</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="4">
-     <widget class="QLineEdit" name="txt_address">
-      <property name="text">
-       <string>10.0.0.227</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="4">
-     <widget class="QLabel" name="lbl_volume">
-      <property name="font">
-       <font>
-        <family>Source Code Pro Medium</family>
-        <pointsize>16</pointsize>
-       </font>
-      </property>
-      <property name="frameShape">
-       <enum>QFrame::StyledPanel</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Sunken</enum>
-      </property>
-      <property name="text">
-       <string>-400</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="2">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>Address:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <spacer name="horizontalSpacer">
-      <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="2" column="4">
-     <widget class="QDial" name="dial">
-      <property name="minimum">
-       <number>-805</number>
-      </property>
-      <property name="maximum">
-       <number>-200</number>
-      </property>
-      <property name="singleStep">
-       <number>5</number>
-      </property>
-      <property name="pageStep">
-       <number>5</number>
-      </property>
-      <property name="value">
-       <number>-400</number>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <property name="invertedAppearance">
-       <bool>false</bool>
-      </property>
-      <property name="notchTarget">
-       <double>10.000000000000000</double>
-      </property>
-      <property name="notchesVisible">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
    <item row="2" column="0" rowspan="2" colspan="3">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Input</string>
      </property>
+      <property name="alignment">
+       <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+      </property>
      <property name="flat">
-       <bool>true</bool>
+       <bool>false</bool>
      </property>
      <widget class="QPushButton" name="btn_hdmi1">
       <property name="geometry">
@@ -125,9 +41,15 @@
         <height>21</height>
        </rect>
       </property>
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
       <property name="text">
        <string>HDMI 1</string>
       </property>
+       <property name="flat">
+        <bool>false</bool>
+       </property>
       <property name="input" stdset="0">
        <string>HDMI1</string>
       </property>
@@ -214,6 +136,108 @@
      </widget>
     </widget>
    </item>
+    <item row="1" column="2">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Address:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="4">
+     <widget class="QDial" name="dial">
+      <property name="minimum">
+       <number>-805</number>
+      </property>
+      <property name="maximum">
+       <number>-200</number>
+      </property>
+      <property name="singleStep">
+       <number>5</number>
+      </property>
+      <property name="pageStep">
+       <number>5</number>
+      </property>
+      <property name="value">
+       <number>-400</number>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="invertedAppearance">
+       <bool>false</bool>
+      </property>
+      <property name="notchTarget">
+       <double>10.000000000000000</double>
+      </property>
+      <property name="notchesVisible">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="QPushButton" name="btn_onoff">
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
+      <property name="styleSheet">
+       <string notr="true"/>
+      </property>
+      <property name="text">
+       <string>On</string>
+      </property>
+      <property name="flat">
+       <bool>false</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="4">
+     <widget class="QLineEdit" name="txt_address">
+      <property name="text">
+       <string>10.0.0.227</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="4">
+     <widget class="QLabel" name="lbl_volume">
+      <property name="font">
+       <font>
+        <family>Source Code Pro Medium</family>
+        <pointsize>16</pointsize>
+       </font>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Sunken</enum>
+      </property>
+      <property name="text">
+       <string>-400</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <spacer name="horizontalSpacer">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeType">
+       <enum>QSizePolicy::MinimumExpanding</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
   </layout>
  </widget>
 </widget>
--- a/resources.qrc
+++ b/resources.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+    <qresource>
+        <file>style.css</file>
+    </qresource>
+</RCC>
--- a/style.css
+++ b/style.css
@@ -0,0 +1,43 @@
+QMainWindow {
+    background-color: #404040;
+    border-color: #edf2f4;
+}
+
+QPushButton {
+    background-color: #404040;
+    color: #edf2f4;
+}
+
+QPushButton:hover {
+    border: 1px solid #0077fd;
+}
+
+QLineEdit {
+    background-color: #404040;
+    color: #edf2f4;
+    border: 1px solid #0077fd;
+}
+
+QLineEdit:hover {
+    border: 1px solid #edf2f4;
+}
+
+QLabel {
+    color: #edf2f4;
+}
+
+QGroupBox {
+    color: #edf2f4;
+    border: 1px solid #0077fd;
+    margin-top: 5px;
+}
+
+QGroupBox::title {
+    subcontrol-origin: margin;
+    left: 5px;
+    padding: 0px 5px 0px 5px;
+ }
+
+QLabel#lbl_volume:hover {
+    border: 1px solid #0077fd;
+}
--- a/yremote.pro
+++ b/yremote.pro
@@ -33,3 +33,7 @@ HEADERS += \

 FORMS += \
        mainwindow.ui
+
+RESOURCES = resources.qrc \
+    resources.qrc
+
Author	SHA1	Message	Date
Robin "Rogo" Goltermann	d7e1741833	possible fix for memory leak	2022-07-20 15:43:45 +02:00
Robin "Rogo" Goltermann	87261361b3	fixed missing include, added build folder to gitignore	2019-09-06 13:07:51 +02:00
rogo	082c061ac7	fixed recievcer state off after longer runtime	2018-12-23 18:37:56 +01:00
rogo	fde8b05754	saving window positioning	2018-11-18 00:34:50 +01:00
rogo	112090ab82	added persistent address	2018-11-17 23:06:09 +01:00
rogo	eafff377fd	Merge branch 'master' of http://git.rogocloud.eu/rogo/yremote	2018-11-17 22:30:04 +01:00
rogo	4c473f5d07	added cyclic update	2018-11-17 22:29:57 +01:00
rogo	25da7e6b14	Update 'README.md'	2018-11-17 21:19:12 +00:00
rogo	d187ca69db	Update 'README.md'	2018-11-17 21:17:11 +00:00
rogo	a347c3d965	layout rework	2018-11-17 22:11:01 +01:00
rogo	333dc87b75	dark mode	2018-11-17 21:56:15 +01:00