Fix the Qt4 bindings and link to libshairport dynamically

diff --git a/AirTV-Qt/AirTV.pro b/AirTV-Qt/AirTV.pro
index 8c896c55df5bc3731a91f9ddf212a14b1a6c4e8e..53c3ee7eb9413e3a5baa57027cd4f48a32cd328e 100644 (file)
--- a/AirTV-Qt/AirTV.pro
+++ b/AirTV-Qt/AirTV.pro
@@ -17,53 +17,28 @@ win32 {
     LIBS += C:\\QtSDK\\mingw\\lib\\libws2_32.a
     QMAKE_LFLAGS += -static-libgcc
 }
-unix:!macx {
-    LIBS += -ldns_sd
-}
 macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
 }
 
+LIBS += -lshairplay
 INCLUDEPATH += ../src/include/ ../src/bindings/qt4/
 SOURCES += main.cpp\
-    ../src/lib/utils.c \
-    ../src/lib/sdp.c \
-    ../src/lib/rsapem.c \
-    ../src/lib/rsakey.c \
-    ../src/lib/raop.c \
-    ../src/lib/raop_rtp.c \
-    ../src/lib/raop_buffer.c \
-    ../src/lib/netutils.c \
-    ../src/lib/httpd.c \
-    ../src/lib/http_response.c \
-    ../src/lib/http_request.c \
-    ../src/lib/http_parser.c \
-    ../src/lib/dnssd.c \
-    ../src/lib/base64.c \
-    ../src/lib/alac/alac.c \
-    ../src/lib/crypto/sha1.c \
-    ../src/lib/crypto/rc4.c \
-    ../src/lib/crypto/md5.c \
-    ../src/lib/crypto/hmac.c \
-    ../src/lib/crypto/bigint.c \
-    ../src/lib/crypto/aes.c \
-    ../src/lib/logger.c \
-    ../src/lib/digest.c \
-    audiooutput.cpp \
-    mainapplication.cpp \
-    audiocallbacks.cpp \
     ../src/bindings/qt4/raopservice.cpp \
     ../src/bindings/qt4/raopcallbackhandler.cpp \
-    ../src/bindings/qt4/dnssdservice.cpp
+    ../src/bindings/qt4/dnssdservice.cpp \
+    audiooutput.cpp \
+    mainapplication.cpp \
+    audiocallbacks.cpp
 
 HEADERS  += \
-    audiooutput.h \
-    mainapplication.h \
-    audiocallbacks.h \
     ../src/bindings/qt4/raopservice.h \
     ../src/bindings/qt4/raopcallbacks.h \
     ../src/bindings/qt4/raopcallbackhandler.h \
-    ../src/bindings/qt4/dnssdservice.h
+    ../src/bindings/qt4/dnssdservice.h \
+    audiooutput.h \
+    mainapplication.h \
+    audiocallbacks.h
 
 FORMS    += mainwindow.ui
 
@@ -85,3 +60,4 @@ RESOURCES += \
 
 
 
+

diff --git a/src/bindings/qt4/dnssdservice.h b/src/bindings/qt4/dnssdservice.h
index a2ee573ba05d6a1d64c5dac3f4afb3e80145c875..02b44606899c7244213276fb7a0006c61d48dd5d 100644 (file)
--- a/src/bindings/qt4/dnssdservice.h
+++ b/src/bindings/qt4/dnssdservice.h
@@ -3,7 +3,7 @@
 
 #include <QObject>
 
-#include "dnssd.h"
+#include <shairplay/dnssd.h>
 
 class DnssdService : public QObject
 {

diff --git a/src/bindings/qt4/raopservice.cpp b/src/bindings/qt4/raopservice.cpp
index 2656ad26af20fa05b598640a6cbb3d8d9cc11977..d570b4309630d9331249d5d31d46c57a15ed0f16 100644 (file)
--- a/src/bindings/qt4/raopservice.cpp
+++ b/src/bindings/qt4/raopservice.cpp
@@ -4,8 +4,6 @@
 #include <QThread>
 #include <QDebug>
 
-#include <shairplay/raop.h>
-
 #define RSA_KEY \
 "-----BEGIN RSA PRIVATE KEY-----\n"\
 "MIIEpQIBAAKCAQEA59dE8qLieItsH1WgjrcFRKj6eUWqi+bGLOX1HL3U3GhC/j0Qg90u3sG/1CUt\n"\

diff --git a/src/bindings/qt4/raopservice.h b/src/bindings/qt4/raopservice.h
index 6531e03bfd5b0ac7634a8abb0142bc23c19cca09..3d663e44b8a1249de42669fa259b75a504dcde9c 100644 (file)
--- a/src/bindings/qt4/raopservice.h
+++ b/src/bindings/qt4/raopservice.h
@@ -3,9 +3,9 @@
 
 #include <QObject>
 
-#include "raopcallbacks.h"
+#include <shairplay/raop.h>
 
-#include "raop.h"
+#include "raopcallbacks.h"
 
 class RaopService : public QObject
 {
@@ -20,7 +20,7 @@ public:
     void stop();
 
 private:
-    raop_t *             m_raop;
+    raop_t *  m_raop;
 
 signals: