Ticket #97: itunes49.2.diff

mfd/plugins/audio/audio.cpp

@@ -558 +558 @@
                 int daap_server_type = which_container->getServerType();
                 metadata_server->unlockMetadata();
 
-                if (daap_server_type == MST_daap_itunes48)
+                if (daap_server_type == MST_daap_itunes49)
                 {
+                    input = new DaapInput(this, url, DAAP_SERVER_ITUNES49);
+                }
+                else if (daap_server_type == MST_daap_itunes48)
+                {
                     input = new DaapInput(this, url, DAAP_SERVER_ITUNES48);
                 }
                 else if (daap_server_type == MST_daap_itunes47)

mfd/plugins/daapclient/server_types.h

@@ -20 +20 @@
     DAAP_SERVER_ITUNES46,
     DAAP_SERVER_ITUNES47,
     DAAP_SERVER_ITUNES48,
+    DAAP_SERVER_ITUNES49,
     DAAP_SERVER_MYTH
 };
     

mfd/plugins/daapclient/database.cpp

@@ -91 +91 @@
     {
          metadata_container = metadata_server->createContainer(name, MCCT_audio, MCLT_lan, MST_daap_itunes48);
     }
+    else if(daap_server_type == DAAP_SERVER_ITUNES49)
+    {
+         metadata_container = metadata_server->createContainer(name, MCCT_audio, MCLT_lan, MST_daap_itunes49);
+    }
     else
     {
          metadata_container = metadata_server->createContainer(name, MCCT_audio, MCLT_lan);

mfd/plugins/daapclient/daapinstance.cpp

@@ -575 +575 @@
                     copasetic = false;
                 }
             }
+            else if(itunes_sub_version == 9)
+            {
+                if(daap_server_type != DAAP_SERVER_ITUNES49)
+                {
+                    copasetic = false;
+                }
+            }
             else
             {
                 if(daap_server_type != DAAP_SERVER_ITUNES4X)
@@ -660 +667 @@
                 {
                     daap_server_type = DAAP_SERVER_ITUNES48;
                 }
+                else if(itunes_sub_version == 9)
+                {
+                    daap_server_type = DAAP_SERVER_ITUNES49;
+                }
                 else
                 {
                     warning(QString("seems to be a new version of "

mfd/plugins/daapserver/daapserver.cpp

@@ -387 +387 @@
             {
                 daap_request->setClientType(DAAP_CLIENT_ITUNES48);
             }
+            else if(itunes_sub_version == 9)
+            {
+                daap_request->setClientType(DAAP_CLIENT_ITUNES49);
+            }
             else
             {
                 warning(QString("daapserver does not yet have "
@@ -432 +436 @@
                 if(daap_request->getClientType() == DAAP_CLIENT_ITUNES45 ||
                    daap_request->getClientType() == DAAP_CLIENT_ITUNES46 ||
                    daap_request->getClientType() == DAAP_CLIENT_ITUNES47 ||
-                   daap_request->getClientType() == DAAP_CLIENT_ITUNES48 )
+                   daap_request->getClientType() == DAAP_CLIENT_ITUNES48 ||
+                   daap_request->getClientType() == DAAP_CLIENT_ITUNES49)
                 {
                     response << Tag('apro') << daapVersion3 << end ;
                 }
@@ -1224 +1229 @@
             if(daap_request->getClientType() == DAAP_CLIENT_ITUNES45 ||
                daap_request->getClientType() == DAAP_CLIENT_ITUNES46 ||
                daap_request->getClientType() == DAAP_CLIENT_ITUNES47 ||
-               daap_request->getClientType() == DAAP_CLIENT_ITUNES48)
+               daap_request->getClientType() == DAAP_CLIENT_ITUNES48 ||
+               daap_request->getClientType() == DAAP_CLIENT_ITUNES49)
             {
                 http_request->getResponse()->setBytesInContentRangeHeader(true);
             }

mfd/plugins/daapserver/request.h

@@ -28 +28 @@
     DAAP_CLIENT_ITUNES46,
     DAAP_CLIENT_ITUNES47,
     DAAP_CLIENT_ITUNES48,
+    DAAP_CLIENT_ITUNES49,
     DAAP_CLIENT_MFDDAAPCLIENT
 };
     

mfdlib/mdcontainer.h

@@ -48 +48 @@
     MST_daap_itunes45,
     MST_daap_itunes46,
     MST_daap_itunes47,
-    MST_daap_itunes48
+    MST_daap_itunes48,
+    MST_daap_itunes49
 };
 
 class MetadataContainer