diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmmp/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/qmmp/output.cpp | 5 | ||||
| -rw-r--r-- | src/qmmp/outputwriter.cpp | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt index 0945faa8b..813d0bd39 100644 --- a/src/qmmp/CMakeLists.txt +++ b/src/qmmp/CMakeLists.txt @@ -28,6 +28,14 @@ ENDIF(NOT QMMP_VERSION_STABLE) include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +SET(QMMP_DEFAULT_OUTPUT "" CACHE STRING "default output plugin") +IF(QMMP_DEFAULT_OUTPUT) + ADD_DEFINITIONS(-DQMMP_DEFAULT_OUTPUT=\\\"${QMMP_DEFAULT_OUTPUT}\\\") + MESSAGE(STATUS "Default output: ${QMMP_DEFAULT_OUTPUT}") +ENDIF(QMMP_DEFAULT_OUTPUT) + + SET(libqmmp_SRCS visual.cpp recycler.cpp diff --git a/src/qmmp/output.cpp b/src/qmmp/output.cpp index 9228a0c0e..e2474c676 100644 --- a/src/qmmp/output.cpp +++ b/src/qmmp/output.cpp @@ -143,7 +143,11 @@ void Output::setCurrentFactory(OutputFactory* factory) OutputFactory *Output::currentFactory() { loadPlugins(); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); +#ifdef QMMP_DEFAULT_OUTPUT + QString name = settings.value("Output/current_plugin", QMMP_DEFAULT_OUTPUT).toString(); +#else #ifdef Q_OS_LINUX QString name = settings.value("Output/current_plugin", "alsa").toString(); #elif defined Q_WS_WIN @@ -153,6 +157,7 @@ OutputFactory *Output::currentFactory() #else QString name = settings.value("Output/current_plugin", "oss4").toString(); #endif +#endif //QMMP_DEFAULT_OUTPUT foreach(QmmpPluginCache *item, *m_cache) { if (item->shortName() == name && item->outputFactory()) diff --git a/src/qmmp/outputwriter.cpp b/src/qmmp/outputwriter.cpp index 5c542e771..d5a19d561 100644 --- a/src/qmmp/outputwriter.cpp +++ b/src/qmmp/outputwriter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2015 by Ilya Kotov * + * Copyright (C) 2012-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * |