fix #75

CQtDeployer

@@ -1 +1 @@
-Subproject commit 7492728b745ec644f8abe6af002de1aeba1e8518
+Subproject commit 56a93aaf65cbf04ac06f400473563b95262ceec5

QuasarAppLib

@@ -1 +1 @@
-Subproject commit 381518d52a122f6892e12d8480de40d61ed44e2c
+Subproject commit 745a66bd5bc9c0f9bd2f0add1e35a3b00f7d70a0

SoundBand.pro

@@ -7,8 +7,8 @@ message( DEPLOY_FILES_MASTER = $$DEPLOY_FILES)
 ENABLE_SNAP = 0 #only linux
 ENABLE_INSTALLER = 1 #only desctop
 
-SUBDIRS += Sync \
+SUBDIRS += QuasarAppLib/QuasarApp.pro \
-        QuasarAppLib/QuasarApp.pro \
+        Sync \
         SoundBand \
         CQtDeployer \
         tests

Sync/Sync.pro

@@ -9,6 +9,7 @@ TARGET = Sync
 TEMPLATE = lib
 
 include($$PWD/../deploy.pri);
+include('$$PWD/../QuasarAppLib/QuasarLib.pri');
 
 DISTFILES += \
     sql/InitLacaleDataBase.sql

Sync/config.h

@@ -4,7 +4,7 @@
 // general otions
 #define CURRENT_PLAYLIST_KEY        "currentPlayList"
 #define MAIN_FOLDER_KEY             "songsfolder"
-#define MAIN_FOLDER                 "soundBand"
+#define MAIN_FOLDER                 QDir::homePath() + "/soundBand"
 
 
 // LIB VERSION
@@ -14,7 +14,6 @@
 
 // sqlite config
 #define DATABASE_NAME               "songdata.dat"
-#define BUFFER_NAME                 "buffer"
 #define ALL_SONGS_LIST              "all songs"
 
 // network config
@@ -37,5 +36,5 @@
 #endif
 
 #define LOGER                                   // define this macros if want use logs
-#define LOG_FILE                    "logs.log"
+#define LOG_FILE                    MAIN_FOLDER + "/logs.log"
 #endif // CONFIG_H

Sync/exaptions.cpp

@@ -1,4 +1,5 @@
 #include "exaptions.h"
+#include <QDir>
 
 #ifdef  LOGER
     Log debug_log(LOG_FILE);

Sync/mysql.cpp

@@ -45,10 +45,10 @@ void MySql::initDB(const QString &database){
     if(db) return;
     dataBaseName = database;
     QSettings settings;
-    songDir = settings.value(MAIN_FOLDER_KEY, QDir::homePath() + "/soundBand").toString();
+    songDir = settings.value(MAIN_FOLDER_KEY, MAIN_FOLDER).toString();
     db = new QSqlDatabase();
     *db = QSqlDatabase::addDatabase("QSQLITE", database);
-    QDir d(QString("./%0").arg(dataBaseName));
+    QDir d(MAIN_FOLDER + "/" + dataBaseName);
     db->setDatabaseName(d.absolutePath());
     if(db->open()){
         qyery = new QSqlQuery(*db);
@@ -60,19 +60,18 @@ void MySql::initDB(const QString &database){
                      "data TEXT NOT NULL "
                      ")");
         if(!qyery->exec(qyer)){
+
             sqlErrorLog(qyer);
-            throw InitDBError();
             delete db;
-            return;
+            throw InitDBError();
         }
 
 
         qyer = QString("CREATE UNIQUE INDEX IF NOT EXISTS isongs ON songs(name,size)");
         if(!qyery->exec(qyer)){
             sqlErrorLog(qyer);
-            throw InitDBError();
             delete db;
-            return;
+            throw InitDBError();
         }
 
         qyer = QString("CREATE TABLE IF NOT EXISTS playlists("
@@ -83,9 +82,8 @@ void MySql::initDB(const QString &database){
                      ")");
         if(!qyery->exec(qyer)){
             sqlErrorLog(qyer);
-            throw InitDBError();
             delete db;
-            return;
+            throw InitDBError();
         }
 
         qyer = QString("CREATE TABLE IF NOT EXISTS playlistsdata("
@@ -100,18 +98,16 @@ void MySql::initDB(const QString &database){
                      ")");
         if(!qyery->exec(qyer)){
             sqlErrorLog(qyer);
-            throw InitDBError();
             delete db;
-            return;
+            throw InitDBError();
         }
 
         qyer = QString("CREATE UNIQUE INDEX IF NOT EXISTS iplaylistsdata ON "
                        "playlistsdata(playlist,song)");
         if(!qyery->exec(qyer)){
             sqlErrorLog(qyer);
-            throw InitDBError();
             delete db;
-            return;
+            throw InitDBError();
         }
 
     }
@@ -125,7 +121,7 @@ bool MySql::find(const SongHeader &song, SongStorage &response){
     }
 
     for(SongStorage &i: songs){
-        if((SongHeader&)i == song){
+        if(static_cast<SongHeader&>(i) == song){
             response = i;
             return true;
         }

Sync/player.cpp

@@ -5,10 +5,9 @@
 #include <QDir>
 
 
-Player::Player(const QString &bufferFile, QObject *parent, Flags flags):
+Player::Player(QObject *parent, Flags flags):
     QMediaPlayer(parent, flags)
 {
-   buffer = bufferFile;
    bufferVolume = 0;
 }
 

Sync/player.h

@@ -11,7 +11,6 @@ class Player : public QMediaPlayer
 {
     Q_OBJECT
 private:
-    QString buffer;
     milliseconds playDelay;
     QMediaPlayer::State predState;
     int bufferVolume;
@@ -19,7 +18,7 @@ private:
 
 public:
 
-    Player(const QString& bufferFile, QObject *parent = Q_NULLPTR, Flags flags = Flags());
+    Player( QObject *parent = Q_NULLPTR, Flags flags = Flags());
 
     /**
      * @brief syncBegin - palyer waiting for sunced.

Sync/sync.cpp

@@ -16,7 +16,7 @@ Sync::Sync(const QString &address, int port, const QString &datadir):
 {
     node = new Node(address , this->port = port);
 
-    player = new Player(BUFFER_NAME,nullptr,QMediaPlayer::LowLatency);
+    player = new Player(nullptr, QMediaPlayer::LowLatency);
     if(!player->isAvailable()){
         throw MediaException();
     }