BPM-Studio-Net-Client.pro

@@ -22,8 +22,3 @@ FORMS += \
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
-
-RESOURCES += \
-    BPM-Studio-Net-Client.qrc
-
-RC_ICONS = BPM-Studio-Net-Client-32x32.ico

BPM-Studio-Net-Client.qrc

@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>BPM-Studio-Net-Client-16x16.ico</file>
-        <file>BPM-Studio-Net-Client-32x32.ico</file>
-    </qresource>
-</RCC>

mainwindow.cpp

@@ -7,23 +7,18 @@ MainWindow::MainWindow(QWidget *parent)
 {
     ui->setupUi(this);
 
-    timer = new QTimer(this);
-    timer->setInterval(5000);
+    QTimer *timer = new QTimer(this);
+    timer->setInterval(1000);
     connect(timer,&QTimer::timeout,this,&MainWindow::holen_status);
     timer->start();
-
-    manager = new QNetworkAccessManager();
 }
 
 MainWindow::~MainWindow()
 {
-    delete timer;
-    delete manager;
     delete ui;
 }
 
 void MainWindow::holen_status(){
-    status_loop="ja";
     //Autoplay
     befehl=befehl_getauto;
     sende_befehl();
@@ -60,12 +55,12 @@ void MainWindow::holen_status(){
     befehl=befehl_file;
     sende_befehl();
     ui->lineEdit_titel->setText((status.split("<br>")[0]));
-    status_loop="nein";
 }
 
 bool MainWindow::sende_befehl(){
     ausgabe=url + befehl;
 
+    manager = new QNetworkAccessManager(this);
     QNetworkRequest request(ausgabe);
     QNetworkReply *reply = manager->get(request);
     QEventLoop event_loop;
@@ -85,45 +80,31 @@ bool MainWindow::sende_befehl(){
 }
 
 void MainWindow::on_pushButton_pause_clicked(){
-    if(status_auto=="an"){
-        while(status_loop=="ja")
-            ui->statusbar->showMessage("~");
-        if(status_player1=="play"){
-            befehl=befehl_pause1;
-            sende_befehl();
-        }else if(status_player2=="play"){
-            befehl=befehl_pause2;
-            sende_befehl();
-        }
+    if(status_player1=="play"){
+        befehl=befehl_pause1;
+        sende_befehl();
+
+    }else if(status_player2=="play"){
+        befehl=befehl_pause2;
+        sende_befehl();
     }
 }
 
 void MainWindow::on_pushButton_play_clicked(){
-    if(status_auto=="an"){
-        while(status_loop=="ja")
-            ui->statusbar->showMessage("~");
-        if(!(status_player1=="play") || !(status_player2=="play")){
-            if(status_player1=="pause"){
-                befehl=befehl_play1;
-                sende_befehl();
-            }else if(status_player2=="pause"){
-                befehl=befehl_play2;
-                sende_befehl();
-            }else{
-                befehl=befehl_play1;
-                sende_befehl();
-            }
+    if(!(status_player1=="play") || !(status_player2=="play")){
+        if(status_player1=="aus" || status_player1=="pause"){
+            befehl=befehl_play1;
+            sende_befehl();
+        }else if(status_player2=="aus" || status_player2=="pause"){
+            befehl=befehl_play2;
+            sende_befehl();
         }
     }
 }
 
 void MainWindow::on_pushButton_fade_clicked(){
-    if(status_auto=="an"){
-        while(status_loop=="ja")
-            ui->statusbar->showMessage("~");
-        if(status_player1=="play" || status_player2=="play"){
-            befehl=befehl_fade;
-            sende_befehl();
-        }
+    if(status_player1=="play" || status_player2=="play"){
+        befehl=befehl_fade;
+        sende_befehl();
     }
 }

mainwindow.h

@@ -6,7 +6,9 @@
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
+#include <QPalette>
 #include <QTimer>
+#include <QThread>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -31,14 +33,12 @@ private:
 
     bool sende_befehl();
 
-    QTimer *timer;
     QNetworkAccessManager *manager;
 
     QString ip="192.168.100.7";
     QString port="80";
     QString url="http://" + ip + ":" + port + "/";
     QString ausgabe;
-    QString status_loop;
     QString status;
     QString status_player1;
     QString status_player2;