added wave output plugin

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@901 90c681e8-e032-0410-971d-27865f9a5e38

6 files changed, 47 insertions, 27 deletions

diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro
index e19fe4b5f..c7db7aa8e 100644
--- a/src/plugins/General/General.pro
+++ b/src/plugins/General/General.pro
@@ -1,8 +1,8 @@
 SUBDIRS += statusicon \
-           scrobbler \
-           mpris \
            notifier \
-           hal \
            lyrics \
-           hotkey
+           scrobbler
+unix:SUBDIRS += mpris \                
+                hal \
+                hotkey
 TEMPLATE = subdirs
diff --git a/src/plugins/General/lyrics/lyrics.pro b/src/plugins/General/lyrics/lyrics.pro
index 8f4985481..ac6c8bb01 100644
--- a/src/plugins/General/lyrics/lyrics.pro
+++ b/src/plugins/General/lyrics/lyrics.pro
@@ -6,12 +6,15 @@ warn_on \
 plugin 
 
 TARGET =$$PLUGINS_PREFIX/General/lyrics
-QMAKE_CLEAN = $$PLUGINS_PREFIX/General/liblyrics.so
+unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/liblyrics.so
 
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
-LIBS += -lqmmpui -lqmmp
+unix:QMAKE_LIBDIR += ../../../../lib
+unix:LIBS += -lqmmpui -lqmmp
+
+win32:QMAKE_LIBDIR += ../../../../bin
+win32:LIBS += -lqmmpui0 -lqmmp0
 
 TRANSLATIONS = translations/lyrics_plugin_cs.ts \
                translations/lyrics_plugin_de.ts \
@@ -21,16 +24,17 @@ TRANSLATIONS = translations/lyrics_plugin_cs.ts \
                translations/lyrics_plugin_pl.ts \
                translations/lyrics_plugin_uk_UA.ts
 RESOURCES = translations/translations.qrc
-
+wnix{
 isEmpty(LIB_DIR){
     LIB_DIR = /lib
 }
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
-
+}
 HEADERS += lyricsfactory.h \
            lyrics.h \
            lyricswindow.h
+win32:HEADERS += ../../../../src/qmmpui/general.h
 SOURCES += lyricsfactory.cpp \
            lyrics.cpp \
            lyricswindow.cpp
diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro
index 9c80b2215..ed6da6813 100644
--- a/src/plugins/General/notifier/notifier.pro
+++ b/src/plugins/General/notifier/notifier.pro
@@ -6,12 +6,14 @@ warn_on \
 plugin
 
 TARGET =$$PLUGINS_PREFIX/General/notifier
-QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libnotifier.so
+unix:QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libnotifier.so
 
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
-LIBS += -lqmmpui -lqmmp
+unix:QMAKE_LIBDIR += ../../../../lib
+unix:LIBS += -lqmmpui -lqmmp
+win32:QMAKE_LIBDIR += ../../../../bin
+win32:LIBS += -lqmmpui0 -lqmmp0
 
 TRANSLATIONS = translations/notifier_plugin_cs.ts \
                translations/notifier_plugin_de.ts \
@@ -23,17 +25,19 @@ TRANSLATIONS = translations/notifier_plugin_cs.ts \
 RESOURCES = notifier_images.qrc \
             translations/translations.qrc
 
+win32 {
 isEmpty(LIB_DIR){
     LIB_DIR = /lib
 }
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
-#FORMS += settingsdialog.ui
+}
 
 HEADERS += notifierfactory.h \
  notifier.h \
  popupwidget.h \
  settingsdialog.h
+win32:HEADERS += ../../../../src/qmmpui/general.h
 SOURCES += notifierfactory.cpp \
  notifier.cpp \
  popupwidget.cpp \
diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp
index a83508a3a..26712a93b 100644
--- a/src/plugins/General/notifier/popupwidget.cpp
+++ b/src/plugins/General/notifier/popupwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2009 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -35,7 +35,7 @@ PopupWidget::PopupWidget(QWidget *parent)
         : QFrame(parent)
 {
     setWindowFlags(Qt::X11BypassWindowManagerHint |
-                   Qt::WindowStaysOnTopHint | Qt::Window);
+                   Qt::WindowStaysOnTopHint | Qt::Dialog | Qt::FramelessWindowHint);
     setFrameStyle(QFrame::Box | QFrame::Plain);
 
     QHBoxLayout *hlayout = new QHBoxLayout(this);
diff --git a/src/plugins/General/scrobbler/scrobbler.pro b/src/plugins/General/scrobbler/scrobbler.pro
index 98f55d53e..75af38213 100644
--- a/src/plugins/General/scrobbler/scrobbler.pro
+++ b/src/plugins/General/scrobbler/scrobbler.pro
@@ -5,10 +5,11 @@ CONFIG += release \
           plugin  
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
+unix:QMAKE_LIBDIR += ../../../../lib
+win32:QMAKE_LIBDIR += ../../../../bin
 
 TARGET=$$PLUGINS_PREFIX/General/scrobbler
-QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libscrobbler.so
+unix:QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libscrobbler.so
 
 
 TRANSLATIONS = translations/scrobbler_plugin_cs.ts \
@@ -20,28 +21,28 @@ TRANSLATIONS = translations/scrobbler_plugin_cs.ts \
                translations/scrobbler_plugin_uk_UA.ts
 RESOURCES = translations/translations.qrc
 
+unix{
 isEmpty(LIB_DIR){
     LIB_DIR = /lib
 }
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
-#FORMS += settingsdialog.ui
-
-#RESOURCES += images/images.qrc
-
+}
 
 HEADERS += scrobblerfactory.h \
            scrobbler.h \
- settingsdialog.h
+           settingsdialog.h
+win32:HEADERS += ../../../../src/qmmpui/general.h
 SOURCES += scrobblerfactory.cpp \
            scrobbler.cpp \
- settingsdialog.cpp
+           settingsdialog.cpp
 QT += network
 
 
 INCLUDEPATH += ../../../
 
-LIBS += -lqmmpui -lqmmp
+unix:LIBS += -lqmmpui -lqmmp
+win32:LIBS += -lqmmpui0 -lqmmp0
 
 FORMS += settingsdialog.ui
 
diff --git a/src/plugins/General/statusicon/statusicon.pro b/src/plugins/General/statusicon/statusicon.pro
index b9bd03e21..66c72773c 100644
--- a/src/plugins/General/statusicon/statusicon.pro
+++ b/src/plugins/General/statusicon/statusicon.pro
@@ -5,13 +5,21 @@ CONFIG += release \
 warn_on \
 plugin 
 
-TARGET =$$PLUGINS_PREFIX/General/statusicon
-QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libstatusicon.so
+unix:TARGET =$$PLUGINS_PREFIX/General/statusicon
+unix:QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libstatusicon.so
+win32:TARGET = $$PLUGINS_PREFIX/General/statusicon
 
 
 TEMPLATE = lib
+
+unix{
 QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmpui -lqmmp
+}
+win32{
+QMAKE_LIBDIR += ../../../../bin
+LIBS += -lqmmpui0 -lqmmp0
+}
 
 TRANSLATIONS = translations/statusicon_plugin_cs.ts \
                translations/statusicon_plugin_de.ts \
@@ -22,12 +30,13 @@ TRANSLATIONS = translations/statusicon_plugin_cs.ts \
                translations/statusicon_plugin_uk_UA.ts
 RESOURCES = translations/translations.qrc
 
+unix{
 isEmpty(LIB_DIR){
     LIB_DIR = /lib
 }
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
-
+}
 RESOURCES += images/tray_images.qrc
 
 
@@ -41,3 +50,5 @@ SOURCES += statusiconfactory.cpp \
            qmmptrayicon.cpp
 FORMS += settingsdialog.ui
 
+win32:HEADERS += ../../../../src/qmmpui/general.h
+