[banshee] AppleDevice: Fix music appearing in Videos in Banshee (bgo#636448)

[Gabriel Burt <gburt src gnome org>]

commit 35671996b8f9ea69cd081d88b6f2e1603a839ab9
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Tue Mar 29 11:17:23 2011 -0500

    AppleDevice: Fix music appearing in Videos in Banshee (bgo#636448)

 .../AppleDeviceTrackInfo.cs                        |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
index 5d85d89..178266d 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
@@ -165,9 +165,10 @@ namespace Banshee.Dap.AppleDevice
             case GPod.MediaType.Audio:
                 MediaAttributes |= TrackMediaAttributes.Music;
                 break;
-            case GPod.MediaType.AudioVideo:
+            // This seems to cause audio files to show up in Banshee in the Videos section
+            /*case GPod.MediaType.AudioVideo:
                 MediaAttributes |= TrackMediaAttributes.VideoStream;
-                break;
+                break;*/
             case GPod.MediaType.MusicVideo:
                 MediaAttributes |= TrackMediaAttributes.Music | TrackMediaAttributes.VideoStream;
                 break;
@@ -188,6 +189,11 @@ namespace Banshee.Dap.AppleDevice
                 MediaAttributes |= TrackMediaAttributes.Music | TrackMediaAttributes.VideoStream | TrackMediaAttributes.TvShow;
                 break;
             }
+
+            // If it's just AudioStream, add Music to it as well so it'll show up in Music
+            if (MediaAttributes == TrackMediaAttributes.AudioStream) {
+                MediaAttributes |= TrackMediaAttributes.Music;
+            }
         }
 
         public void CommitToIpod (GPod.ITDB database)
@@ -260,7 +266,10 @@ namespace Banshee.Dap.AppleDevice
                 } else if (HasAttribute (TrackMediaAttributes.TvShow)) {
                     track.MediaType = GPod.MediaType.TVShow;
                 } else {
-                    track.MediaType = GPod.MediaType.AudioVideo;
+                    // I dont' think AudioVideo should be used here; upon loading the tracks
+                    // into Banshee, audio files often have AudioVideo (aka MediaType == 0) too.
+                    //track.MediaType = GPod.MediaType.AudioVideo;
+                    track.MediaType = GPod.MediaType.Movie;
                 }
             } else {
                 if (HasAttribute (TrackMediaAttributes.Podcast)) {