Ticket #1503: 0001-Mediaplayer-remember-position-and-volume.patch

src/apps/mediaplayer/Controller.cpp

@@ -29 +29 @@
 
 #include <Autolock.h>
 #include <Bitmap.h>
+#include <Catalog.h>
 #include <Debug.h>
 #include <Path.h>
 #include <Window.h> // for debugging only
@@ -50 +51 @@
 #include "TrackSupplier.h"
 #include "VideoTrackSupplier.h"
 
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-Controller"
+#define MIN_WIDTH 250
+
 using std::nothrow;
 
 
@@ -680 +685 @@
 }
 
 
+status_t
+Controller::SaveState(bool reset)
+{
+    if (fItem.Get() == NULL)
+        return B_OK;
+    if (reset)
+        fCurrentFrame = 0;
+    status_t status = fItem.Get()->SetLastVolume(fVolume);
+    if (status == B_OK)
+        status = fItem.Get()->SetLastFrame(fCurrentFrame);
+    else
+        fItem.Get()->SetLastFrame(fCurrentFrame);
+    return status;
+}
+
+
+void
+Controller::RestoreState()
+{
+    PlaylistItem *item =fItem.Get();
+    if (item == NULL)
+        return;
+
+    Pause();
+
+    if (item->LastFrame() > 0) {
+        bool resume = fResume == mpSettings::RESUME_ALWAYS;
+        if (fResume == mpSettings::RESUME_ASK) {
+            BString label;
+            int32 time = (int32)((float)item->LastFrame() * TimeDuration()
+                / (1000000 * _FrameDuration()));
+            label.SetToFormat(B_TRANSLATE("Do you want to resume %s at %dm%ds?"),
+                item->Name().String(), time / 60, time % 60);
+            BAlert *alert = new BAlert(B_TRANSLATE("Resume?"), label,
+                B_TRANSLATE("Resume"), B_TRANSLATE("Reset"));
+            resume = alert->Go() == 0;
+        }
+
+        if (resume)
+            SetFramePosition(item->LastFrame());
+    }
+
+    float lastVolume = item->LastVolume();
+    if (lastVolume >= 0)
+        SetVolume(lastVolume);
+
+    Play();
+}
+
+
 void
 Controller::SetVolume(float value)
 {
@@ -699 +754 @@
     }
 }
 
+
 void
 Controller::VolumeUp()
 {
@@ -706 +762 @@
     SetVolume(Volume() + 0.05);
 }
 
+
 void
 Controller::VolumeDown()
 {
@@ -713 +770 @@
     SetVolume(Volume() - 0.05);
 }
 
+
 void
 Controller::ToggleMute()
 {
@@ -974 +1032 @@
     fLoopMovies = settings.loopMovie;
     fLoopSounds = settings.loopSound;
     fBackgroundMovieVolumeMode = settings.backgroundMovieVolumeMode;
+    fResume = settings.resume;
 }
 
 

src/apps/mediaplayer/Controller.h

@@ -22 +22 @@
 #define __CONTROLLER_H
 
 
+#include <Alert.h>
 #include <Entry.h>
 #include <MediaDefs.h>
 #include <MediaFormats.h>
@@ -115 +116 @@
 
             bigtime_t           TimeDuration();
             bigtime_t           TimePosition();
+            status_t            SaveState(bool reset = false);
+            void                RestoreState();
 
     virtual void                SetVolume(float factor);
             float               Volume();
@@ -224 +227 @@
             bool                fLoopMovies;
             bool                fLoopSounds;
             uint32              fBackgroundMovieVolumeMode;
+            uint32              fResume;
 
             BList               fListeners;
 };

src/apps/mediaplayer/MainWin.cpp

@@ -697 +697 @@
         {
             BAutolock _(fPlaylist);
 
+            //The file is finished. Open at start next time.
+            fController->SaveState(true);
+
             bool hadNext = fPlaylist->SetCurrentItemIndex(
                 fPlaylist->CurrentItemIndex() + 1);
             if (!hadNext) {
@@ -799 +802 @@
             float volume;
             if (msg->FindFloat("volume", &volume) == B_OK)
                 fControls->SetVolume(volume);
+            fController->SaveState();
             break;
         }
         case MSG_CONTROLLER_MUTED_CHANGED:
@@ -1067 +1071 @@
 bool
 MainWin::QuitRequested()
 {
+    fController->SaveState();
     BMessage message(M_PLAYER_QUIT);
     GetQuitMessage(&message);
     be_app->PostMessage(&message);
@@ -1401 +1406 @@
         }
         fController->SetTimePosition(fInitialSeekPosition);
         fInitialSeekPosition = 0;
+
+        if (fPlaylist->CountItems() == 1)
+            fController->RestoreState();
     }
     _SetupWindow();
 
@@ -2452 +2460 @@
         } else if (seekTime > fController->TimeDuration()) {
             fInitialSeekPosition = 0;
             PostMessage(M_SKIP_NEXT);
-        } else
+        } else {
             fController->SetTimePosition(seekTime);
+        }
     }
 
     fController->Unlock();

src/apps/mediaplayer/playlist/FilePlaylistItem.cpp

@@ -114 +114 @@
             BEntry entry(&fRefs[0], false);
             return entry.Rename(string.String(), false);
         }
-    
+
         case ATTR_STRING_KEYWORDS:
             return _SetAttribute("Meta:Keywords", B_STRING_TYPE,
                 string.String(), string.Length());
@@ -190 +190 @@
 FilePlaylistItem::SetAttribute(const Attribute& attribute,
     const int64& value)
 {
+    if (attribute == ATTR_INT64_FRAME) {
+        return _SetAttribute("Media:Frame", B_INT64_TYPE, &value,
+            sizeof(int64));
+    }
+
     return B_NOT_SUPPORTED;
 }
 
@@ -198 +203 @@
 FilePlaylistItem::GetAttribute(const Attribute& attribute,
     int64& value) const
 {
+    if (attribute == ATTR_INT64_FRAME) {
+        return _GetAttribute("Media:Frame", B_INT64_TYPE, &value,
+            sizeof(int64));
+    }
+
+    return B_NOT_SUPPORTED;
+}
+
+
+status_t
+FilePlaylistItem::SetAttribute(const Attribute& attribute,
+    const float& value)
+{
+        if (attribute == ATTR_FLOAT_VOLUME) {
+            return _SetAttribute("Media:Volume", B_FLOAT_TYPE, &value,
+                sizeof(float));
+        }
+
+        return B_NOT_SUPPORTED;
+}
+
+
+status_t
+FilePlaylistItem::GetAttribute(const Attribute& attribute,
+    float& value) const
+{
+    if (attribute == ATTR_FLOAT_VOLUME) {
+        return _GetAttribute("Media:Volume", B_FLOAT_TYPE, &value,
+            sizeof(float));
+    }
+
     return B_NOT_SUPPORTED;
 }
 
@@ -236 +272 @@
     err = _MoveIntoTrash(&fRefs, &fNamesInTrash);
     if (err != B_OK)
         return err;
-    
+
     if (fImageRefs.empty())
         return B_OK;
 
@@ -260 +296 @@
     err = _RestoreFromTrash(&fRefs, &fNamesInTrash);
     if (err != B_OK)
         return err;
-    
+
     if (fImageRefs.empty())
         return B_OK;
 
@@ -381 +417 @@
 
     if (fImageRefs.empty())
         return ref;
-    
+
     return fImageRefs[0];
 }
 
@@ -407 +443 @@
 
 status_t
 FilePlaylistItem::_GetAttribute(const char* attrName, type_code type,
-    void* data, size_t size)
+    void* data, size_t size) const
 {
     BEntry entry(&fRefs[0], true);
     BNode node(&entry);
@@ -452 +488 @@
                 (*refs)[i].name, strerror(err));
             return err;
         }
-    
+
         // Find a unique name for the entry in the trash
         (*namesInTrash)[i] = (*refs)[i].name;
         int32 uniqueNameIndex = 1;
@@ -464 +500 @@
             (*namesInTrash)[i] << ' ' << uniqueNameIndex;
             uniqueNameIndex++;
         }
-    
+
         // Remember the original path
         BPath originalPath;
         entry.GetPath(&originalPath);
-    
+
         // Finally, move the entry into the trash
         err = entry.MoveTo(&trashDir, (*namesInTrash)[i].String());
         if (err != B_OK) {
@@ -476 +512 @@
                 trashPath, strerror(err));
             return err;
         }
-    
+
         // Allow Tracker to restore this entry
         BNode node(&entry);
         BString originalPathString(originalPath.Path());
@@ -498 +534 @@
         fprintf(stderr, "failed to find Trash: %s\n", strerror(err));
         return err;
     }
-    
+
     for (vector<entry_ref>::size_type i = 0; i < refs->size(); i++) {
         // construct the entry to the file in the trash
         // TODO: BEntry(const BDirectory* directory, const char* path) is broken!
@@ -513 +549 @@
         }
         //entry.GetPath(&path);
         //printf("moving '%s'\n", path.Path());
-    
+
         // construct the folder of the original entry_ref
         node_ref nodeRef;
         nodeRef.device = (*refs)[i].device;
@@ -525 +561 @@
                 "%s: %s\n", (*refs)[i].name, strerror(err));
             return err;
         }
-    
+
         //path.SetTo(&originalDir, fItems[i].name);
         //printf("as '%s'\n", path.Path());
-    
+
         // Reset the name here, the user may have already moved the entry
         // out of the trash via Tracker for example.
         (*namesInTrash)[i] = "";
-    
+
         // Finally, move the entry back into the original folder
         err = entry.MoveTo(&originalDir, (*refs)[i].name);
         if (err != B_OK) {
@@ -540 +576 @@
                 "%s: %s\n", (*refs)[i].name, strerror(err));
             return err;
         }
-    
+
         // Remove the attribute that helps Tracker restore the entry.
         BNode node(&entry);
         node.RemoveAttr("_trk/original_path");

src/apps/mediaplayer/playlist/FilePlaylistItem.h

@@ -43 +43 @@
                                     const int64& value);
     virtual status_t            GetAttribute(const Attribute& attribute,
                                     int64& value) const;
+    
+    virtual status_t            SetAttribute(const Attribute& attribute,
+                                    const float& value);
+    virtual status_t            GetAttribute(const Attribute& attribute,
+                                    float& value) const;
 
     // methods
     virtual BString             LocationURI() const;
@@ -67 +72 @@
                                     size_t size);
             status_t            _GetAttribute(const char* attrName,
                                     type_code type, void* data,
-                                    size_t size);
+                                    size_t size) const;
             status_t            _MoveIntoTrash(vector<entry_ref>* refs,
                                     vector<BString>* namesInTrash);
             status_t            _RestoreFromTrash(vector<entry_ref>* refs,

src/apps/mediaplayer/playlist/PlaylistItem.cpp

@@ -19 +19 @@
 {
 }
 
+
 PlaylistItem::Listener::~Listener()
 {
 }
 
+
 void PlaylistItem::Listener::ItemChanged(const PlaylistItem* item)
 {
 }
@@ -31 +33 @@
 // #pragma mark -
 
 
-//#define DEBUG_INSTANCE_COUNT
+// #define DEBUG_INSTANCE_COUNT
 #ifdef DEBUG_INSTANCE_COUNT
 static vint32 sInstanceCount = 0;
 #endif
@@ -107 +109 @@
 }
 
 
+int64
+PlaylistItem::LastFrame() const
+{
+    int64 lastFrame;
+    if (GetAttribute(ATTR_INT64_FRAME, lastFrame) != B_OK)
+        lastFrame = 0;
+    return lastFrame;
+}
+
+
+float
+PlaylistItem::LastVolume() const
+{
+    float lastVolume;
+    if (GetAttribute(ATTR_FLOAT_VOLUME, lastVolume) != B_OK)
+        lastVolume = -1;
+    return lastVolume;
+}
+
+
+status_t
+PlaylistItem::SetLastFrame(int64 value)
+{
+    return SetAttribute(ATTR_INT64_FRAME, value);
+}
+
+
+status_t
+PlaylistItem::SetLastVolume(float value)
+{
+    return SetAttribute(ATTR_FLOAT_VOLUME, value);
+}
+
+
 void
 PlaylistItem::SetPlaybackFailed()
 {

src/apps/mediaplayer/playlist/PlaylistItem.h

@@ -53 +53 @@
 
         ATTR_INT32_TRACK            = 'trck',
         ATTR_INT32_YEAR             = 'year',
-        ATTR_INT32_RATING           = 'rtng'
+        ATTR_INT32_RATING           = 'rtng',
+
+        ATTR_INT64_FRAME            = 'fram',
+
+        ATTR_FLOAT_VOLUME           = 'volu'
     } Attribute;
 
     virtual status_t            SetAttribute(const Attribute& attribute,
@@ -70 +74 @@
                                     const int64& value) = 0;
     virtual status_t            GetAttribute(const Attribute& attribute,
                                     int64& value) const = 0;
+    
+    virtual status_t            SetAttribute(const Attribute& attribute,
+                                    const float& value) = 0;
+    virtual status_t            GetAttribute(const Attribute& attribute,
+                                    float& value) const = 0;
 
     // convenience access to attributes
             BString             Name() const;
@@ -78 +87 @@
             BString             Title() const;
 
             int32               TrackNumber() const;
+            int64               LastFrame() const;
+            float               LastVolume() const;
+
+            status_t            SetLastFrame(int64 value);
+            status_t            SetLastVolume(float value);
 
     // methods
     virtual BString             LocationURI() const = 0;

src/apps/mediaplayer/settings/Settings.cpp

@@ -26 +26 @@
         || useOverlays != other.useOverlays
         || scaleBilinear != other.scaleBilinear
         || scaleFullscreenControls != other.scaleFullscreenControls
+        || resume != other.resume
         || subtitleSize != other.subtitleSize
         || subtitlePlacement != other.subtitlePlacement
         || backgroundMovieVolumeMode != other.backgroundMovieVolumeMode
@@ -61 +62 @@
     settings.scaleFullscreenControls
         = fSettingsMessage.GetValue("scaleFullscreenControls", true);
 
+    settings.resume
+        = fSettingsMessage.GetValue("resume",
+            (uint32)mpSettings::RESUME_ASK);
     settings.subtitleSize
         = fSettingsMessage.GetValue("subtitleSize",
             (uint32)mpSettings::SUBTITLE_SIZE_MEDIUM);
@@ -95 +99 @@
     fSettingsMessage.SetValue("scaleFullscreenControls",
         settings.scaleFullscreenControls);
 
+    fSettingsMessage.SetValue("resume", settings.resume);
     fSettingsMessage.SetValue("subtitleSize", settings.subtitleSize);
     fSettingsMessage.SetValue("subtitlePlacement", settings.subtitlePlacement);
 

src/apps/mediaplayer/settings/Settings.h

@@ -34 +34 @@
                 BG_MOVIES_HALF_VLUME = 1,
                 BG_MOVIES_MUTED = 2
             };
+            enum {
+                RESUME_NEVER = 0,
+                RESUME_ASK = 1,
+                RESUME_ALWAYS = 2
+            };
 
             bool                autostart;
             bool                closeWhenDonePlayingMovie;
@@ -43 +48 @@
             bool                useOverlays;
             bool                scaleBilinear;
             bool                scaleFullscreenControls;
+            uint32              resume;
             uint32              subtitleSize;
             uint32              subtitlePlacement;
             uint32              backgroundMovieVolumeMode;

src/apps/mediaplayer/settings/SettingsWindow.cpp

@@ -99 +99 @@
         B_TRANSLATE("Scale controls in full screen mode"),
         new BMessage(M_SETTINGS_CHANGED));
 
+    fResumeOP = new BOptionPopUp("resume",
+        B_TRANSLATE("Resume:"), new BMessage(M_SETTINGS_CHANGED));
+    fResumeOP->AddOption(
+        B_TRANSLATE("never"), mpSettings::RESUME_NEVER);
+    fResumeOP->AddOption(
+        B_TRANSLATE("ask every time"), mpSettings::RESUME_ASK);
+    fResumeOP->AddOption(
+        B_TRANSLATE("always"), mpSettings::RESUME_ALWAYS);
+
     fSubtitleSizeOP = new BOptionPopUp("subtitleSize",
         B_TRANSLATE("Subtitle size:"), new BMessage(M_SETTINGS_CHANGED));
     fSubtitleSizeOP->AddOption(
@@ -156 +165 @@
                     .End()
                     .Add(fLoopMoviesCB)
                     .Add(fLoopSoundsCB)
+                    .Add(fResumeOP)
                 .End()
             .End()
             .AddStrut(kSpacing)
@@ -270 +280 @@
     fScaleBilinearCB->SetValue(fSettings.scaleBilinear);
     fScaleFullscreenControlsCB->SetValue(fSettings.scaleFullscreenControls);
 
+    fResumeOP->SetValue(fSettings.resume);
     fSubtitleSizeOP->SetValue(fSettings.subtitleSize);
     fSubtitlePlacementOP->SetValue(fSettings.subtitlePlacement);
 
@@ -300 +311 @@
     fSettings.scaleFullscreenControls
         = fScaleFullscreenControlsCB->Value() == B_CONTROL_ON;
 
+    fSettings.resume = fResumeOP->Value();
     fSettings.subtitleSize = fSubtitleSizeOP->Value();
     fSettings.subtitlePlacement = fSubtitlePlacementOP->Value();
 

src/apps/mediaplayer/settings/SettingsWindow.h

@@ -47 +47 @@
         BCheckBox*              fScaleBilinearCB;
         BCheckBox*              fScaleFullscreenControlsCB;
 
+        BOptionPopUp*           fResumeOP;
         BOptionPopUp*           fSubtitleSizeOP;
         BOptionPopUp*           fSubtitlePlacementOP;