From 310e64f172cd2a2cc899646d3454b412eb802d95 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 23 Sep 2015 04:14:28 +0000 Subject: [PATCH] generic: misc cleanups --- kmix/CMakeLists.txt | 16 ++++------------ kmix/ChangeLog | 55 ----------------------------------------------------- 2 files changed, 4 insertions(+), 67 deletions(-) delete mode 100644 kmix/ChangeLog diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt index 691d330b..b8595738 100644 --- a/kmix/CMakeLists.txt +++ b/kmix/CMakeLists.txt @@ -26,10 +26,7 @@ alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} ) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100) -include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) -if(MSVC) - include_directories( ${TAGLIB_INCLUDES} ) -endif(MSVC) +include_directories(${KDE4_INCLUDES} ${GLIB2_INCLUDE_DIR} /usr/lib/oss/include) include(CheckCXXSourceCompiles) @@ -43,10 +40,7 @@ check_cxx_source_compiles(" " HAVE_STD_TR1_SHARED_PTR) -configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) - - -include_directories( ${GLIB2_INCLUDE_DIR} /usr/lib/oss/include) +configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) add_subdirectory( pics ) add_subdirectory( profiles ) @@ -54,13 +48,11 @@ add_subdirectory( profiles ) if (PULSEAUDIO_FOUND) add_definitions(-DHAVE_PULSE) - include_directories(${PULSEAUDIO_INCLUDE_DIR}) endif (PULSEAUDIO_FOUND) if (CANBERRA_FOUND) add_definitions(-DHAVE_CANBERRA) - include_directories(${CANBERRA_INCLUDE_DIRS}) endif (CANBERRA_FOUND) @@ -129,7 +121,7 @@ set(kmix_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS} core/volume.cpp ) -add_executable( kmix ${kmix_SRCS}) +add_executable(kmix ${kmix_SRCS}) target_link_libraries(kmix ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS}) @@ -212,7 +204,7 @@ set(kmixctrl_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS} # gui/guiprofile.cpp -add_executable( kmixctrl ${kmixctrl_SRCS}) +add_executable(kmixctrl ${kmixctrl_SRCS}) target_link_libraries(kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS}) diff --git a/kmix/ChangeLog b/kmix/ChangeLog deleted file mode 100644 index 02f72dc2..00000000 --- a/kmix/ChangeLog +++ /dev/null @@ -1,55 +0,0 @@ -KDE v4.13 -- Configuration menu is now using Tabs to provide a more standard, convenient and pleasing layout -- Sound Menu: Play button reflects playback status and shows either "Play" or "Pause" - -- Bugfixes and Features: -Bug ID Severity Summary -317926 critical kmix start delayed on 20 seconds -315383 normal mpris volume/play status not in sync with app in kmix applet -299477 normal KMix Does Not Unmute Master Audio Channel -256854 normal Tray popup obscures vertical panel -304144 normal KMix does not distinguish separate channels on one volume control -296951 normal Tray plasmoid scroll/hiding issues [read description] -303608 crash Kmix crashed after selecting Amarok as master and instantly crashed when changing song. Volumes in exeption of the integrated subwoofer go fine; the built-in woofer must be changed trough Alsa, and Amarok must be volumed up/down by it's bar. -214854 normal kmix size is not restored by session management, only position. -319600 major KMix volume icon is unstale during playback - - -KDE v4.11 -- Full Sound Menu: Media Player control support - -v3.8 -- Feature : KMix has now a profile for TerraTec DMX6Fire cards and is able to handle it's weird volume controls - -v3.6 -- This is the KDE 4.4 version -- Wish 166591: "Integrate OSS4 support". -- Wish 70042: "What's this help documentation on channels (aka Tooltip)" -- Wish 57946: "horizontally movable kmix controls". Added GUI for ordering (w/o GUI it was possible since 2006-02-21) -- Wish 172883: "recording tab is gone". Working on it. Some issues left. most important: Controls might "disappear" in the written XML GUIProfile (duplicate handling)- -- Wish 188803: "No osd for mute/unmute" - -i001: When the user redefines the automatially grabbed XF86Volume* keys, he doesn't have an easy possibilty to get them back, because they are now marked as "no shortcut" in the global shortcut registry. The user must go the KDE system settings module "global shortcuts" and reset them to their default. No user will wfind that!!! So this should be possible inside KMix (ShortcutsDialog or a button "reset volume keys" in the configuration dialog). - -v3.5 -- This is the KDE 4.2 head version -- Wish 132330: On-screen display of volume level -- Wish 157701: Smaller neater dockarea popup -- Bug 161393: kmix does not associate hotplugged USB HID volume control -- Bug 168658: kmix - master channel missing -- Bug 172958: OSD doesn't update when volume is changed using keyboard -- Feature : Automatically grab XF86VolumeUp, XF86VolumeDown and XF86VolumeMute (done) - -v3.0 -- KDE 4 version - -V1.91 -- Multiple soundcards on ALSA are now supported -- Mixer device names are now shown with a vertical label (saves space and looks nice) -- MixerDevice categories. Allows to distribute devices on "New Mixer Tab...". It is used - in the panel applet to show only important devices initally. -- Much nicer "New Mixer Tab..." dialog - -V1.90 -Version shipped with KDE3.1 - -- 2.11.0