Merge branch 'master' into tweetsip

src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp

@@ -81,6 +81,7 @@ CollapsibleControls::init()
     m_summaryLayout = new QHBoxLayout;
     m_summaryWidget->setLayout( m_summaryLayout );
     m_summaryLayout->setMargin( 0 );
+    m_summaryWidget->setContentsMargins( 3, 0, 0, 0 );
     
     m_summary = new QLabel( m_summaryWidget );
     m_summaryLayout->addWidget( m_summary, 1 );

src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp

@@ -84,7 +84,7 @@ DynamicSetupWidget::DynamicSetupWidget( const Tomahawk::dynplaylist_ptr& playlis
     setLayout( m_layout );
     
     m_fadeAnim = new QPropertyAnimation( this, "opacity" );
-    m_fadeAnim->setDuration( 500 );
+    m_fadeAnim->setDuration( 250 );
     m_fadeAnim->setStartValue( 0.00 );
     m_fadeAnim->setEndValue( .86 );
     

src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp

@@ -32,13 +32,12 @@
 #include "ReadOrWriteWidget.h"
 #include "CollapsibleControls.h"
 #include "DynamicControlWrapper.h"
+#include "playlistmanager.h"
 #include "dynamic/DynamicView.h"
 #include <qevent.h>
 #include "DynamicSetupWidget.h"
 #include <QPainter>
 
-#include "tomahawk/tomahawkapp.h"
-#include "tomahawkwindow.h"
 #include "audiocontrols.h"
 
 using namespace Tomahawk;
@@ -89,8 +88,8 @@ DynamicWidget::DynamicWidget( const Tomahawk::dynplaylist_ptr& playlist, QWidget
     connect( m_controls, SIGNAL( controlsChanged() ), this, SLOT( controlsChanged() ), Qt::QueuedConnection );
     
     
-    connect( TomahawkApp::instance()->mainWindow()->audioControls(), SIGNAL( playPressed() ), this, SLOT( playPressed() ) );
-    connect( TomahawkApp::instance()->mainWindow()->audioControls(), SIGNAL( pausePressed() ), this, SLOT( pausePressed() ) );
+    connect( PlaylistManager::instance(), SIGNAL( playClicked() ), this, SLOT( playPressed() ) );
+    connect( PlaylistManager::instance(), SIGNAL( pauseClicked() ), this, SLOT( pausePressed() ) );
 }
 
 DynamicWidget::~DynamicWidget()

src/libtomahawk/playlist/playlistmanager.cpp

@@ -670,3 +670,13 @@ PlaylistManager::showCurrentTrack()
 /*    if ( m_currentView && m_currentProxyModel )
         m_currentView->scrollTo( m_currentProxyModel->currentItem(), QAbstractItemView::PositionAtCenter );*/
 }
+
+void
+PlaylistManager::onPlayClicked() {
+    emit playClicked();
+}
+
+void
+PlaylistManager::onPauseClicked() {
+    emit pauseClicked();
+}

src/libtomahawk/playlist/playlistmanager.h

@@ -69,6 +69,8 @@ signals:
     void statsAvailable( bool b );
     void modesAvailable( bool b );
 
+    void playClicked();
+    void pauseClicked();
 public slots:
     void setTreeMode();
     void setTableMode();
@@ -85,6 +87,11 @@ public slots:
     // called by the playlist creation dbcmds
     void createPlaylist( const Tomahawk::source_ptr& src, const QVariant& contents );
     void createDynamicPlaylist( const Tomahawk::source_ptr& src, const QVariant& contents );
+    
+    // ugh need to set up the connection in tomahawk to libtomahawk
+    void onPlayClicked();
+    void onPauseClicked();
+    
 private slots:
     void applyFilter();
 

src/libtomahawk/utils/tomahawkutils.cpp

@@ -16,7 +16,6 @@
 #ifdef Q_WS_MAC
     #include <Carbon/Carbon.h>
     #include <sys/sysctl.h>
-#include <thirdparty/jdns/qjdns.h>
 #endif
 
 #include <qjdns.h>

src/tomahawkwindow.cpp

@@ -53,8 +53,11 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
     setUnifiedTitleAndToolBarOnMac( true );
 #endif
 
-    new PlaylistManager( this );
-
+    PlaylistManager* pm = new PlaylistManager( this );
+    
+    connect( m_audioControls, SIGNAL( playPressed() ), pm, SLOT( onPlayClicked() ) );
+    connect( m_audioControls, SIGNAL( pausePressed() ), pm, SLOT( onPauseClicked() ) );
+    
     ui->setupUi( this );
 
     delete ui->playlistWidget;

thirdparty/jdns/jdns/qjdns.cpp

@@ -50,7 +50,7 @@ QJDns::Record::Record()
 	haveKnown = false;
 }
 
-bool QJDns::Record::verify() const
+bool QJDns::Record::doVerify() const
 {
 	jdns_rr_t *rr = export_record(*this);
 	int ok = jdns_rr_verify(rr);

thirdparty/jdns/jdns/qjdns.h

@@ -111,7 +111,7 @@ public:
 		QByteArray os;           // for Hinfo
 
 		Record();
-		bool verify() const;
+		bool doVerify() const;
 	};
 
 	class Response