Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Disable windows thumbbar 

Fixes stability issues with WASAPI
This commit is contained in:
Jonas Kvinge 2020-10-15 16:07:20 +02:00
parent aeb0d05017
commit e44a3d013d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -887,9 +887,9 @@ optional_source(WIN32
SOURCES SOURCES
engine/directsounddevicefinder.cpp engine/directsounddevicefinder.cpp
engine/mmdevicefinder.cpp engine/mmdevicefinder.cpp
core/windows7thumbbar.cpp #core/windows7thumbbar.cpp
HEADERS #HEADERS
core/windows7thumbbar.h #core/windows7thumbbar.h
) )
optional_source(HAVE_SUBSONIC optional_source(HAVE_SUBSONIC

8
src/core/mainwindow.cpp
View File

@ -192,7 +192,7 @@
#include "smartplaylists/smartplaylistsviewcontainer.h" #include "smartplaylists/smartplaylistsviewcontainer.h"
#include "smartplaylists/smartplaylistsview.h" #include "smartplaylists/smartplaylistsview.h"
#ifdef Q_OS_WIN #if 0
# include "windows7thumbbar.h" # include "windows7thumbbar.h"
#endif #endif
@ -215,7 +215,7 @@ const int kTrackPositionUpdateTimeMs = 1000;
MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSDBase *osd, const CommandlineOptions &options, QWidget *parent) : MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSDBase *osd, const CommandlineOptions &options, QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui_(new Ui_MainWindow), ui_(new Ui_MainWindow),
#ifdef Q_OS_WIN #if 0
thumbbar_(new Windows7ThumbBar(this)), thumbbar_(new Windows7ThumbBar(this)),
#endif #endif
app_(app), app_(app),
@ -750,7 +750,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSDBase *osd
} }
// Windows 7 thumbbar buttons // Windows 7 thumbbar buttons
#ifdef Q_OS_WIN #if 0
thumbbar_->SetActions(QList<QAction*>() << ui_->action_previous_track << ui_->action_play_pause << ui_->action_stop << ui_->action_next_track << nullptr << ui_->action_love); thumbbar_->SetActions(QList<QAction*>() << ui_->action_previous_track << ui_->action_play_pause << ui_->action_stop << ui_->action_next_track << nullptr << ui_->action_love);
#endif #endif
@ -2739,7 +2739,7 @@ bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *r
Q_UNUSED(eventType); Q_UNUSED(eventType);
Q_UNUSED(result); Q_UNUSED(result);
#ifdef Q_OS_WIN #if 0
MSG *msg = static_cast<MSG*>(message); MSG *msg = static_cast<MSG*>(message);
thumbbar_->HandleWinEvent(msg); thumbbar_->HandleWinEvent(msg);
#else #else