Fix Zeroconf with recent Qt5

Fix #441: Handle VLC volume and muted state properly

ChangeLog

@@ -1,6 +1,7 @@
 Version 0.9.0:
     * Resolved various playback issues by switching to a new audio engine.
     * Fixed collection sorting.
+    * Fixed volume/mute state not being reset correctly on startup.
 
 Version 0.8.4:
     * Fixed drag & drop issues on sidebar.

src/libtomahawk/network/Servent.cpp

@@ -1371,7 +1371,10 @@ Servent::isIPWhitelisted( QHostAddress ip )
         }
     }
 
-#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 )
+// Did something change in Qt 5? In Qt 5.5 Zeroconf does not work with this code ifdef'ed out
+// @xhochy can you shed some light on this?
+
+// #if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 )
     // Qt4 cannot cope correctly with IPv4 addresses mapped into the IPv6
     // address space
     if ( ip.protocol() == QAbstractSocket::IPv6Protocol )
@@ -1397,7 +1400,7 @@ Servent::isIPWhitelisted( QHostAddress ip )
             return isIPWhitelisted( addr );
         }
     }
-#endif
+// #endif
 
     tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "failure";
     return false;

src/libtomahawk/playlist/XspfUpdater.cpp

@@ -156,6 +156,7 @@ XspfUpdater::setAutoUpdate( bool autoUpdate )
     emit changed();
 }
 
+
 void
 XspfUpdater::setInterval( int intervalMsecs )
 {

src/tomahawk/main.cpp

@@ -167,7 +167,7 @@ main( int argc, char *argv[] )
     QCA::Initializer init;
     Q_UNUSED( init )
 
-#ifdef Q_OS_MAC
+    #ifdef Q_OS_MAC
     // Do Mac specific startup to get media keys working.
     // This must go before QApplication initialisation.
     Tomahawk::macMain();
@@ -253,11 +253,11 @@ main( int argc, char *argv[] )
 
 
 #ifdef Q_OS_MAC
-#ifdef Q_OS_MAC64
+    #ifdef Q_OS_MAC64
 static pascal OSErr appleEventHandler( const AppleEvent* e, AppleEvent*, void* )
-#elif defined Q_OS_MAC32
+    #elif defined Q_OS_MAC32
 static pascal OSErr appleEventHandler( const AppleEvent* e, AppleEvent*, long )
-#endif //Q_OS_MAC64/32
+    #endif //Q_OS_MAC64/32
 {
     OSType id = typeWildCard;
     AEGetAttributePtr( e, keyEventIDAttr, typeType, 0, &id, sizeof( id ), 0 );

src/tomahawk/sourcetree/SourceTreeView.cpp

@@ -447,7 +447,6 @@ SourceTreeView::deletePlaylist( const QModelIndex& idxIn )
 
     m_popupDialog.data()->move( rightCenter.x() - m_popupDialog.data()->offset(), rightCenter.y() - m_popupDialog.data()->sizeHint().height() / 2. );
     m_popupDialog.data()->show();
-
 }
 
 
@@ -797,20 +796,21 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
 {
     QTreeView::dragMoveEvent( event );
 
+    bool accept = false;
     if ( DropJob::isDropType( DropJob::Playlist, event->mimeData() ) )
     {
         // Don't highlight the drop for a playlist, as it won't get added to the playlist but created generally
         event->setDropAction( Qt::CopyAction );
-        event->accept();
+        accept = true;
     }
     else if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Track, DropJob::Append ) )
     {
-        bool accept = false;
         setDirtyRegion( m_dropRect );
         const QPoint pos = event->pos();
         const QModelIndex index = indexAt( pos );
-        dataChanged( m_dropIndex, m_dropIndex );
-        m_dropIndex = QPersistentModelIndex( index );
+
+        if ( index != m_dropIndex )
+            dataChanged( m_dropIndex, m_dropIndex );
 
         if ( index.isValid() )
         {
@@ -829,7 +829,8 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
                     case SourcesModel::CategoryAdd:
                     case SourcesModel::Source: //drop to send tracks to peers
                         m_delegate->hovered( index, event->mimeData() );
-                        dataChanged( index, index );
+                        if ( index != m_dropIndex )
+                            dataChanged( index, index );
                         break;
 
                     default:
@@ -845,24 +846,28 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
             m_dropRect = QRect();
         }
 
-        if ( accept || DropJob::isDropType( DropJob::Playlist, event->mimeData() ) )
+        if ( accept )
         {
             // Playlists are accepted always since they can be dropped anywhere
             //tDebug() << Q_FUNC_INFO << "Accepting";
             event->setDropAction( Qt::CopyAction );
-            event->accept();
-        }
-        else
-        {
-//             tDebug() << Q_FUNC_INFO << "Ignoring";
-            event->ignore();
         }
+        m_dropIndex = QPersistentModelIndex( index );
     }
     else if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Playlist | DropJob::Artist | DropJob::Album, DropJob::Create ) )
     {
         event->setDropAction( Qt::CopyAction );
+        accept = true;
+    }
+
+    if ( accept )
+    {
         event->accept();
     }
+    else
+    {
+        event->ignore();
+    }
 
     setDirtyRegion( m_dropRect );
 }