Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

performed a make format

This commit is contained in:
Ethan Warth 2015-08-14 15:48:01 -05:00
parent 2356a9b591
commit 40d985c7f9
2 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/ui/behavioursettingspage.cpp
View File

@ -47,21 +47,21 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog* dialog)
MainWindow::PlayBehaviour_IfStopped); MainWindow::PlayBehaviour_IfStopped);
ui_->doubleclick_playmode->setItemData(2, MainWindow::PlayBehaviour_Always); ui_->doubleclick_playmode->setItemData(2, MainWindow::PlayBehaviour_Always);
ui_->doubleclick_playlist_addmode->setItemData(0, ui_->doubleclick_playlist_addmode->setItemData(
MainWindow::PlaylistAddBehaviour_Play); 0, MainWindow::PlaylistAddBehaviour_Play);
ui_->doubleclick_playlist_addmode->setItemData(1, ui_->doubleclick_playlist_addmode->setItemData(
MainWindow::PlaylistAddBehaviour_Enqueue); 1, MainWindow::PlaylistAddBehaviour_Enqueue);
ui_->doubleclick_playlist_addmode->setItemData(2, ui_->doubleclick_playlist_addmode->setItemData(
MainWindow::PlaylistAddBehaviour_PlayNext); 2, MainWindow::PlaylistAddBehaviour_PlayNext);
ui_->doubleclick_playlist_addmode->setItemData(3, ui_->doubleclick_playlist_addmode->setItemData(
MainWindow::PlaylistAddBehaviour_Nothing); 3, MainWindow::PlaylistAddBehaviour_Nothing);
ui_->doubleclick_playlist_playmode->setItemData(0, ui_->doubleclick_playlist_playmode->setItemData(
MainWindow::PlaylistPlayBehaviour_Never); 0, MainWindow::PlaylistPlayBehaviour_Never);
ui_->doubleclick_playlist_playmode->setItemData(1, ui_->doubleclick_playlist_playmode->setItemData(
MainWindow::PlaylistPlayBehaviour_IfStopped); 1, MainWindow::PlaylistPlayBehaviour_IfStopped);
ui_->doubleclick_playlist_playmode->setItemData(2, ui_->doubleclick_playlist_playmode->setItemData(
MainWindow::PlaylistPlayBehaviour_Always); 2, MainWindow::PlaylistPlayBehaviour_Always);
ui_->menu_playmode->setItemData(0, MainWindow::PlayBehaviour_Never); ui_->menu_playmode->setItemData(0, MainWindow::PlayBehaviour_Never);
ui_->menu_playmode->setItemData(1, MainWindow::PlayBehaviour_IfStopped); ui_->menu_playmode->setItemData(1, MainWindow::PlayBehaviour_IfStopped);
@ -81,9 +81,9 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog* dialog)
QString code = lang_re.cap(1); QString code = lang_re.cap(1);
QString lookup_code = QString(code) QString lookup_code = QString(code)
.replace("@latin", "_Latn") .replace("@latin", "_Latn")
.replace("_CN", "_Hans_CN") .replace("_CN", "_Hans_CN")
.replace("_TW", "_Hant_TW"); .replace("_TW", "_Hant_TW");
QString language_name = QString language_name =
QLocale::languageToString(QLocale(lookup_code).language()); QLocale::languageToString(QLocale(lookup_code).language());
#if QT_VERSION >= 0x040800 #if QT_VERSION >= 0x040800
@ -128,11 +128,11 @@ void BehaviourSettingsPage::Load() {
ui_->doubleclick_playlist_addmode->setCurrentIndex( ui_->doubleclick_playlist_addmode->setCurrentIndex(
ui_->doubleclick_playlist_addmode->findData( ui_->doubleclick_playlist_addmode->findData(
s.value("doubleclick_playlist_addmode", s.value("doubleclick_playlist_addmode",
MainWindow::PlaylistAddBehaviour_Play).toInt())); MainWindow::PlaylistAddBehaviour_Play).toInt()));
ui_->doubleclick_playlist_playmode->setCurrentIndex( ui_->doubleclick_playlist_playmode->setCurrentIndex(
ui_->doubleclick_playlist_playmode->findData( ui_->doubleclick_playlist_playmode->findData(
s.value("doubleclick_playlist_playmode", s.value("doubleclick_playlist_playmode",
MainWindow::PlaylistPlayBehaviour_IfStopped).toInt())); MainWindow::PlaylistPlayBehaviour_IfStopped).toInt()));
ui_->menu_playmode->setCurrentIndex(ui_->menu_playmode->findData( ui_->menu_playmode->setCurrentIndex(ui_->menu_playmode->findData(
s.value("menu_playmode", MainWindow::PlayBehaviour_IfStopped).toInt())); s.value("menu_playmode", MainWindow::PlayBehaviour_IfStopped).toInt()));
@ -155,7 +155,8 @@ void BehaviourSettingsPage::Load() {
s.beginGroup(Player::kSettingsGroup); s.beginGroup(Player::kSettingsGroup);
ui_->menu_previousmode->setCurrentIndex(ui_->menu_previousmode->findData( ui_->menu_previousmode->setCurrentIndex(ui_->menu_previousmode->findData(
s.value("menu_previousmode", Player::PreviousBehaviour_DontRestart).toInt())); s.value("menu_previousmode", Player::PreviousBehaviour_DontRestart)
.toInt()));
ui_->seek_step_sec->setValue(s.value("seek_step_sec", 10).toInt()); ui_->seek_step_sec->setValue(s.value("seek_step_sec", 10).toInt());
s.endGroup(); s.endGroup();
@ -218,12 +219,14 @@ void BehaviourSettingsPage::Save() {
.toInt()); .toInt());
MainWindow::PlaylistAddBehaviour doubleclick_playlist_addmode = MainWindow::PlaylistAddBehaviour doubleclick_playlist_addmode =
MainWindow::PlaylistAddBehaviour( MainWindow::PlaylistAddBehaviour(
ui_->doubleclick_playlist_addmode->itemData( ui_->doubleclick_playlist_addmode
ui_->doubleclick_playlist_addmode->currentIndex()).toInt()); ->itemData(ui_->doubleclick_playlist_addmode->currentIndex())
.toInt());
MainWindow::PlaylistPlayBehaviour doubleclick_playlist_playmode = MainWindow::PlaylistPlayBehaviour doubleclick_playlist_playmode =
MainWindow::PlaylistPlayBehaviour( MainWindow::PlaylistPlayBehaviour(
ui_->doubleclick_playlist_playmode->itemData( ui_->doubleclick_playlist_playmode
ui_->doubleclick_playlist_playmode->currentIndex()).toInt()); ->itemData(ui_->doubleclick_playlist_playmode->currentIndex())
.toInt());
MainWindow::PlayBehaviour menu_playmode = MainWindow::PlayBehaviour( MainWindow::PlayBehaviour menu_playmode = MainWindow::PlayBehaviour(
ui_->menu_playmode->itemData(ui_->menu_playmode->currentIndex()).toInt()); ui_->menu_playmode->itemData(ui_->menu_playmode->currentIndex()).toInt());

23
src/ui/mainwindow.cpp
View File

@ -992,10 +992,10 @@ void MainWindow::ReloadSettings() {
s.value("doubleclick_playmode", PlayBehaviour_IfStopped).toInt()); s.value("doubleclick_playmode", PlayBehaviour_IfStopped).toInt());
doubleclick_playlist_addmode_ = doubleclick_playlist_addmode_ =
PlaylistAddBehaviour(s.value("doubleclick_playlist_addmode", PlaylistAddBehaviour(s.value("doubleclick_playlist_addmode",
PlaylistAddBehaviour_Play).toInt()); PlaylistAddBehaviour_Play).toInt());
doubleclick_playlist_playmode_ = PlaylistPlayBehaviour( doubleclick_playlist_playmode_ =
s.value("doubleclick_playlist_playmode", PlaylistPlayBehaviour(s.value("doubleclick_playlist_playmode",
PlaylistPlayBehaviour_IfStopped).toInt()); PlaylistPlayBehaviour_IfStopped).toInt());
menu_playmode_ = menu_playmode_ =
PlayBehaviour(s.value("menu_playmode", PlayBehaviour_IfStopped).toInt()); PlayBehaviour(s.value("menu_playmode", PlayBehaviour_IfStopped).toInt());
} }
@ -1253,8 +1253,8 @@ void MainWindow::PlaylistDoubleClick(const QModelIndex& index) {
switch (doubleclick_playlist_playmode_) { switch (doubleclick_playlist_playmode_) {
case PlaylistPlayBehaviour_IfStopped: case PlaylistPlayBehaviour_IfStopped:
if (app_->player()->GetState() == Engine::Playing) { if (app_->player()->GetState() == Engine::Playing) {
break; // don't play if already playing break; // don't play if already playing
} // otherwise, behave the same as for "Always" (no break statement) } // otherwise, behave the same as for "Always" (no break statement)
case PlaylistPlayBehaviour_Always: case PlaylistPlayBehaviour_Always:
app_->playlist_manager()->SetActiveToCurrent(); app_->playlist_manager()->SetActiveToCurrent();
@ -1269,23 +1269,23 @@ void MainWindow::PlaylistDoubleClick(const QModelIndex& index) {
case PlaylistAddBehaviour_PlayNext: case PlaylistAddBehaviour_PlayNext:
app_->playlist_manager()->current()->queue()->Clear(); app_->playlist_manager()->current()->queue()->Clear();
// continue as if enqueueing (no break statement) // continue as if enqueueing (no break statement)
case PlaylistAddBehaviour_Enqueue: case PlaylistAddBehaviour_Enqueue:
dummyIndexList.append(index); dummyIndexList.append(index);
app_->playlist_manager()->current()->queue()-> app_->playlist_manager()->current()->queue()->ToggleTracks(
ToggleTracks(dummyIndexList); dummyIndexList);
switch (doubleclick_playlist_playmode_) { switch (doubleclick_playlist_playmode_) {
case PlaylistPlayBehaviour_Always: case PlaylistPlayBehaviour_Always:
case PlaylistPlayBehaviour_IfStopped: case PlaylistPlayBehaviour_IfStopped:
if (app_->player()->GetState() != Engine::Playing) { if (app_->player()->GetState() != Engine::Playing) {
app_->player()->PlayAt( app_->player()->PlayAt(
app_->playlist_manager()->current()->queue()->TakeNext(), app_->playlist_manager()->current()->queue()->TakeNext(),
Engine::Manual, true); Engine::Manual, true);
} }
break; break;
case PlaylistPlayBehaviour_Never: case PlaylistPlayBehaviour_Never:
// deliberately do nothing here // deliberately do nothing here
break; break;
} }
break; break;
@ -1293,7 +1293,6 @@ void MainWindow::PlaylistDoubleClick(const QModelIndex& index) {
// deliberately do nothing here // deliberately do nothing here
break; break;
} }
} }
void MainWindow::VolumeWheelEvent(int delta) { void MainWindow::VolumeWheelEvent(int delta) {