Ticket #1503: mediaplayer-volume-memory.diff

src/apps/mediaplayer/MainWin.cpp

@@ -587 +587 @@
             PlaylistItemRef item(fPlaylist->ItemAt(index));
             if (item.Get() != NULL) {
                 printf("open playlist item: %s\n", item->Name().String());
+                printf("\n ! Save current volume last played item\n");
+                if (fLatestPlaylistItem != NULL) {
+                    if (fLatestPlaylistItem->SetVolume(fController->Volume()) != B_OK) {
+                        printf(" !  SetVolume failed.");
+                    } else {
+                        printf(" !  Volume set to %i", (int)fLatestPlaylistItem->Volume());
+                    }
+                }
                 OpenPlaylistItem(item);
+                fLatestPlaylistItem = fPlaylist->ItemAt(index);
+                printf("\n ! Load item volume\n");
+                if (fLatestPlaylistItem->Volume() != -1) {
+                    fController->SetVolume((float)fLatestPlaylistItem->Volume());
+                    printf(" !  Loading volume: %i", (int)fLatestPlaylistItem->Volume());
+                }
                 _MarkPlaylistItem(index);
             }
             break;

src/apps/mediaplayer/MainWin.h

@@ -152 +152 @@
             bool                fHasAudio;
 
             Playlist*           fPlaylist;
+            PlaylistItem*       fLatestPlaylistItem;
             PlaylistObserver*   fPlaylistObserver;
             Controller*         fController;
             ControllerObserver* fControllerObserver;

src/apps/mediaplayer/playlist/FilePlaylistItem.cpp

@@ -127 +127 @@
 FilePlaylistItem::SetAttribute(const Attribute& attribute,
     const int64& value)
 {
+    if (attribute == ATTR_INT64_VOLUME) {
+        BNode node(&fRef);
+        return node.WriteAttr("mediaplayer:volume", B_INT64_TYPE, 0, &value, sizeof(value));
+    }
+
     return B_NOT_SUPPORTED;
 }
 
@@ -135 +140 @@
 FilePlaylistItem::GetAttribute(const Attribute& attribute,
     int64& value) const
 {
+    if (attribute == ATTR_INT64_VOLUME) {
+        BNode node(&fRef);
+        return node.ReadAttr("mediaplayer:volume", B_INT64_TYPE, 0, &value, sizeof(value));
+    }
+
     return B_NOT_SUPPORTED;
 }
 
@@ -298 +308 @@
     return new (std::nothrow) BMediaFile(&fRef);
 }
 
+
+status_t
+FilePlaylistItem::SetVolume(int64 volume)
+{
+    return SetAttribute(ATTR_INT64_VOLUME, volume);
+}

src/apps/mediaplayer/playlist/PlaylistItem.cpp

@@ -120 +120 @@
 }
 
 
+int64
+PlaylistItem::Volume() const
+{
+    int64 volume;
+    if (GetAttribute(ATTR_INT64_VOLUME, volume) != B_OK)
+        volume = -1;
+    return volume;
+}
+
+
 void
 PlaylistItem::SetPlaybackFailed()
 {

src/apps/mediaplayer/playlist/PlaylistItem.h

@@ -50 +50 @@
         ATTR_INT32_RATING       = 'rtng',
         ATTR_INT32_BIT_RATE     = 'btrt',
 
-        ATTR_INT64_DURATION     = 'drtn'
+        ATTR_INT64_DURATION     = 'drtn',
+
+        ATTR_INT64_VOLUME       = 'volu'
     } Attribute;
 
     virtual status_t            SetAttribute(const Attribute& attribute,
@@ -79 +81 @@
 
             bigtime_t           Duration() const;
 
+            int64               Volume() const;
+
     // methods
     virtual BString             LocationURI() const = 0;
     virtual status_t            GetIcon(BBitmap* bitmap,
@@ -87 +91 @@
     virtual status_t            MoveIntoTrash() = 0;
     virtual status_t            RestoreFromTrash() = 0;
 
+    virtual status_t            SetVolume(int64 volume) = 0;
+
     // playback
     virtual BMediaFile*         CreateMediaFile() const = 0;
 

src/apps/mediaplayer/playlist/FilePlaylistItem.h

@@ -47 +47 @@
     virtual status_t            MoveIntoTrash();
     virtual status_t            RestoreFromTrash();
 
+    virtual status_t            SetVolume(int64 volume);
+
     // playback
     virtual BMediaFile*         CreateMediaFile() const;