Compare commits
No commits in common. "9c559e8a8f6e7270c83bbb6d116f6c547d91ff33" and "f665ccfd7dbc2a54833e0d276546af55b30ef5a6" have entirely different histories.
9c559e8a8f
...
f665ccfd7d
6 changed files with 5 additions and 18 deletions
|
@ -34,6 +34,7 @@ v 0.3.0
|
||||||
- Rose noise and sine generator.
|
- Rose noise and sine generator.
|
||||||
- Logs, verbosity, timestamp.
|
- Logs, verbosity, timestamp.
|
||||||
- New play mode without pitch control, it saves resources. MA_SOUND_FLAG_NO_PITCH
|
- New play mode without pitch control, it saves resources. MA_SOUND_FLAG_NO_PITCH
|
||||||
|
- SettingsDialog.
|
||||||
- Load/save conf file.
|
- Load/save conf file.
|
||||||
- ¿Exit Point? is it needed?
|
- ¿Exit Point? is it needed?
|
||||||
- Hardening: check return errors, try/catch exceptions, i'm too happy....
|
- Hardening: check return errors, try/catch exceptions, i'm too happy....
|
||||||
|
@ -45,5 +46,4 @@ v 0.3.0
|
||||||
|
|
||||||
v 0.2.1 showplayer
|
v 0.2.1 showplayer
|
||||||
|
|
||||||
- SettingsDialog, configuración gráfica.
|
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,6 @@ libreMediaServerAudioUi::libreMediaServerAudioUi(QWidget *parent)
|
||||||
addDockWidget(Qt::TopDockWidgetArea, topWidget);
|
addDockWidget(Qt::TopDockWidgetArea, topWidget);
|
||||||
connect(ui.actionLaunch_OLA_Setup, SIGNAL(triggered()), this, SLOT(olasetup()));
|
connect(ui.actionLaunch_OLA_Setup, SIGNAL(triggered()), this, SLOT(olasetup()));
|
||||||
connect(ui.actionLaunchShowPlayer, SIGNAL(triggered()), this, SLOT(launchShowPlayerWindow()));
|
connect(ui.actionLaunchShowPlayer, SIGNAL(triggered()), this, SLOT(launchShowPlayerWindow()));
|
||||||
connect(ui.actionAudioSetup, SIGNAL(triggered()), this, SLOT(audioSetupWindow));
|
|
||||||
this->setContentsMargins(0, 0, 0, 0);
|
this->setContentsMargins(0, 0, 0, 0);
|
||||||
this->setStyleSheet(
|
this->setStyleSheet(
|
||||||
"margin: 0px;"
|
"margin: 0px;"
|
||||||
|
@ -99,8 +98,3 @@ void libreMediaServerAudioUi::launchShowPlayerWindow()
|
||||||
{
|
{
|
||||||
m_showPlayer->show();
|
m_showPlayer->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
void libreMediaServerAudioUi::audioSetupWindow()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
@ -46,7 +46,6 @@ private:
|
||||||
private slots:
|
private slots:
|
||||||
void olasetup();
|
void olasetup();
|
||||||
void launchShowPlayerWindow();
|
void launchShowPlayerWindow();
|
||||||
void audioSetupWindow();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // LIBREMEDIASERVERAUDIOUI_H
|
#endif // LIBREMEDIASERVERAUDIOUI_H
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
<font>
|
<font>
|
||||||
<family>Unifont</family>
|
<family>Unifont</family>
|
||||||
<pointsize>12</pointsize>
|
<pointsize>12</pointsize>
|
||||||
|
<weight>75</weight>
|
||||||
<bold>true</bold>
|
<bold>true</bold>
|
||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
|
@ -37,11 +38,10 @@
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="menuFile">
|
<widget class="QMenu" name="menuFile">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Setup</string>
|
<string>File</string>
|
||||||
</property>
|
</property>
|
||||||
<addaction name="actionLaunch_OLA_Setup"/>
|
<addaction name="actionLaunch_OLA_Setup"/>
|
||||||
<addaction name="actionLaunchShowPlayer"/>
|
<addaction name="actionLaunchShowPlayer"/>
|
||||||
<addaction name="actionAudioSetup"/>
|
|
||||||
</widget>
|
</widget>
|
||||||
<addaction name="menuFile"/>
|
<addaction name="menuFile"/>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -55,11 +55,6 @@
|
||||||
<string>Show Player</string>
|
<string>Show Player</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionAudioSetup">
|
|
||||||
<property name="text">
|
|
||||||
<string>Audio</string>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
</widget>
|
</widget>
|
||||||
<resources>
|
<resources>
|
||||||
<include location="../lms-resources.qrc"/>
|
<include location="../lms-resources.qrc"/>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
|
|
||||||
ShowPlayer::ShowPlayer(QWidget *parent) :
|
ShowPlayer::ShowPlayer(QWidget *parent) :
|
||||||
QDialog(parent, Qt::Window)
|
QDialog(parent)
|
||||||
, ui(new Ui::ShowPlayer)
|
, ui(new Ui::ShowPlayer)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
@ -31,7 +31,6 @@ ShowPlayer::ShowPlayer(QWidget *parent) :
|
||||||
ui->splitter_controls->restoreState(Settings::getInstance()->value("controlsSplitter").toByteArray());
|
ui->splitter_controls->restoreState(Settings::getInstance()->value("controlsSplitter").toByteArray());
|
||||||
ui->splitter_cues->restoreState(Settings::getInstance()->value("cueSplitter").toByteArray());
|
ui->splitter_cues->restoreState(Settings::getInstance()->value("cueSplitter").toByteArray());
|
||||||
Settings::getInstance()->endGroup();
|
Settings::getInstance()->endGroup();
|
||||||
ui->activeCueList->setSelectionMode(QAbstractItemView::NoSelection);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ShowPlayer::~ShowPlayer()
|
ShowPlayer::~ShowPlayer()
|
||||||
|
|
Loading…
Add table
Reference in a new issue