diff --git a/src/cuetrackwidget.ui b/src/cuetrackwidget.ui
index 2d72fa9..88cb8ab 100644
--- a/src/cuetrackwidget.ui
+++ b/src/cuetrackwidget.ui
@@ -33,89 +33,15 @@
:/buttons/resources/icon.png:/buttons/resources/icon.png
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- 0
- 0
-
-
-
-
- 734
- 16777215
-
-
-
- QFrame::StyledPanel
-
+
Qt::Vertical
-
- false
-
-
- 8
-
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
- QFrame::StyledPanel
-
+
Qt::Horizontal
-
-
-
- 2
- 0
-
-
-
-
- 0
- 0
-
-
-
- Cue Progress
-
-
- Cue Progress
-
-
- 24
-
-
@@ -132,7 +58,6 @@
14
- 75
true
@@ -177,7 +102,6 @@
13
- 75
true
@@ -209,6 +133,29 @@
3
+
+
+
+ 2
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ Cue Progress
+
+
+ Cue Progress
+
+
+ 24
+
+
@@ -316,7 +263,6 @@
- 75
true
false
@@ -369,7 +315,6 @@
13
- 75
true
@@ -414,7 +359,7 @@
- 340
+ 16777215
16777215
@@ -814,7 +759,7 @@
-
-
+
0
0
diff --git a/src/libremediaserver-audio-ui.cpp b/src/libremediaserver-audio-ui.cpp
index e1f8533..925e767 100644
--- a/src/libremediaserver-audio-ui.cpp
+++ b/src/libremediaserver-audio-ui.cpp
@@ -45,10 +45,27 @@ libreMediaServerAudioUi::libreMediaServerAudioUi(QWidget *parent)
"selection-background-color: green"
);
m_showPlayer = new ShowPlayer();
+ Settings::getInstance()->beginGroup("mainwindow");
+ auto geometry = Settings::getInstance()->value("geometry", QByteArray()).toByteArray();
+ if (!geometry.isEmpty())
+ restoreGeometry(geometry);
+ geometry = Settings::getInstance()->value("showPlayerGeometry", QByteArray()).toByteArray();
+ if (!geometry.isEmpty())
+ m_showPlayer->restoreGeometry(geometry);
+ Settings::getInstance()->endGroup();
}
libreMediaServerAudioUi::~libreMediaServerAudioUi()
{
+ Settings::getInstance()->beginGroup("mainwindow");
+ Settings::getInstance()->setValue("size", size());
+ Settings::getInstance()->setValue("fullScreen", isFullScreen());
+ Settings::getInstance()->setValue("geometry", saveGeometry());
+ Settings::getInstance()->setValue("showPlayer", m_showPlayer->isVisible());
+ Settings::getInstance()->setValue("showPlayerSize", m_showPlayer->size());
+ Settings::getInstance()->setValue("showPlayerGeometry", m_showPlayer->saveGeometry());
+ Settings::getInstance()->endGroup();
+ delete m_showPlayer;
}
void libreMediaServerAudioUi::olasetup()
@@ -60,6 +77,5 @@ void libreMediaServerAudioUi::olasetup()
void libreMediaServerAudioUi::launchShowPlayerWindow()
{
- //m_showPlayer->showMaximized();
m_showPlayer->show();
}
diff --git a/src/libremediaserver-audio.cpp b/src/libremediaserver-audio.cpp
index 6c287ff..f3dab82 100644
--- a/src/libremediaserver-audio.cpp
+++ b/src/libremediaserver-audio.cpp
@@ -66,17 +66,6 @@ libreMediaServerAudio::~libreMediaServerAudio()
if (m_settings->getDmxActive())
m_ola->stop();
m_mae.stopEngine();
- Settings::getInstance()->beginGroup("mainwindow");
- Settings::getInstance()->setValue("size", m_lmsUi->size());
- Settings::getInstance()->setValue("fullScreen", m_lmsUi->isFullScreen());
- Settings::getInstance()->setValue("geometry", m_lmsUi->saveGeometry());
- Settings::getInstance()->setValue("showPlayer", m_lmsUi->m_showPlayer->isVisible());
- Settings::getInstance()->setValue("showPlayerSize", m_lmsUi->m_showPlayer->size());
- Settings::getInstance()->setValue("showPlayerGeometry", m_lmsUi->m_showPlayer->saveGeometry());
- Settings::getInstance()->endGroup();
- //m_settings->settingsSaver();
- if (m_settings->getShowPlayerActive())
- m_lmsUi->m_showPlayer->saveCueTrackList("lastshow.xml");
delete m_lmsUi;
delete m_settings;
sleep(1);
@@ -316,7 +305,6 @@ void libreMediaServerAudio::setUi(libreMediaServerAudioUi *lmsUi)
m_ola->start(QThread::TimeCriticalPriority );
} else {
m_lmsUi->m_dmxWidget->hide();
- //m_lmsUi->topWidget->hide();
}
for (uint i = 0; i < m_settings->getAudioDeviceQty(); i++) {
char *name = m_mae.getDeviceName(i);
@@ -326,14 +314,6 @@ void libreMediaServerAudio::setUi(libreMediaServerAudioUi *lmsUi)
m_lmsUi->m_showPlayer->loadCueTrackList("lastshow.xml");
m_lmsUi->m_showPlayer->show();
}
- m_settings->beginGroup("mainwindow");
- auto geometry = m_settings->value("geometry", QByteArray()).toByteArray();
- if (!geometry.isEmpty())
- lmsUi->restoreGeometry(geometry);
- geometry = m_settings->value("showPlayerGeometry", QByteArray()).toByteArray();
- if (!geometry.isEmpty())
- lmsUi->m_showPlayer->restoreGeometry(geometry);
- m_settings->endGroup();
m_refreshUi = new QTimer(this);
connect(m_refreshUi, SIGNAL(timeout()), this, SLOT(refreshUi()));
m_refreshUi->start(UI_REFRESH_TIME);
diff --git a/src/miniaudioengine.cpp b/src/miniaudioengine.cpp
index d81b309..3992287 100644
--- a/src/miniaudioengine.cpp
+++ b/src/miniaudioengine.cpp
@@ -285,7 +285,7 @@ ma_result MiniAudioEngine::startDevices()
engineConfig.noAutoStart = MA_TRUE;
for (uint internalId = 0; internalId < m_mae.audioDevicesQty; internalId++) {
- deviceConfig.capture.pDeviceID = &m_mae.pPlaybackDeviceInfos[m_mae.audioDevicesId[internalId]].id;
+ //deviceConfig.capture.pDeviceID = &m_mae.pPlaybackDeviceInfos[m_mae.audioDevicesId[internalId]].id;
deviceConfig.playback.pDeviceID = &m_mae.pPlaybackDeviceInfos[m_mae.audioDevicesId[internalId]].id;
deviceConfig.pUserData = &m_mae.engines[internalId];
result = ma_device_init(&m_mae.context, &deviceConfig, &m_mae.devices[internalId]);
diff --git a/src/settings.cpp b/src/settings.cpp
index 1f43582..53b02c3 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -19,10 +19,10 @@ Settings::Settings(QObject *parent) :
m_audioDeviceQty = 0;
for (uint i = 0; i < MAX_AUDIODEVICES; i++)
m_audioDeviceId[i] = -1;
- if (QFile::exists(fileName()))
- settingsLoader();
- else if (QFile::exists(DEFAULT_FILE))
+ if (QFile::exists(DEFAULT_FILE))
readFromFile(DEFAULT_FILE);
+ else if (QFile::exists(fileName()))
+ settingsLoader();
else {
qDebug() << "Can not read initial settings, making some standard";
setValue("lmsAudio/ui", 1);
diff --git a/src/showplayer.cpp b/src/showplayer.cpp
index d8caba7..328227b 100644
--- a/src/showplayer.cpp
+++ b/src/showplayer.cpp
@@ -26,12 +26,22 @@ ShowPlayer::ShowPlayer(QWidget *parent) :
prevCue[i] = nullptr;
}
ui->nextCue->setNextCue();
+ Settings::getInstance()->beginGroup("showPlayerSplittersState");
+ ui->splitter_main->restoreState(Settings::getInstance()->value("mainSplitter").toByteArray());
+ ui->splitter_controls->restoreState(Settings::getInstance()->value("controlsSplitter").toByteArray());
+ ui->splitter_cues->restoreState(Settings::getInstance()->value("cueSplitter").toByteArray());
+ Settings::getInstance()->endGroup();
}
ShowPlayer::~ShowPlayer()
{
saveCueTrackList("lastshow.xml");
- delete ui;
+ Settings::getInstance()->beginGroup("showPlayerSplittersState");
+ Settings::getInstance()->setValue("mainSplitter", ui->splitter_main->saveState());
+ Settings::getInstance()->setValue("controlsSplitter", ui->splitter_controls->saveState());
+ Settings::getInstance()->setValue("cueSplitter", ui->splitter_cues->saveState());
+ Settings::getInstance()->endGroup();
+ delete ui;
}
void ShowPlayer::onAddTrack() {
diff --git a/src/showplayer.ui b/src/showplayer.ui
index 8eef3ec..768f936 100644
--- a/src/showplayer.ui
+++ b/src/showplayer.ui
@@ -34,7 +34,7 @@
-
-
+
Qt::Vertical
@@ -238,7 +238,7 @@
-
+
Qt::Horizontal
@@ -325,7 +325,7 @@
-
+
Qt::Horizontal