swaroop: tweak width proportions of lists.

[dcpomatic.git] / src / wx / swaroop_controls.cc

diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index 6a40e1fc0ca12284c581b677764467e88ecf7e0a..5e386ae9bae5631ac75893482a86434ca5f9eb73 100644 (file)
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -26,6 +26,8 @@
 #include "static_text.h"
 #include "lib/player_video.h"
 #include "lib/dcp_content.h"
+#include "lib/cross.h"
+#include <dcp/raw_convert.h>
 #include <wx/listctrl.h>
 #include <wx/progdlg.h>
 
@@ -44,13 +46,13 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
        , _next_button (new Button(this, "Next"))
        , _previous_button (new Button(this, "Previous"))
        , _current_disable_timeline (false)
-       , _current_disable_next_previous (false)
+       , _current_disable_next (false)
 {
+       _button_sizer->Add (_previous_button, 0, wxEXPAND);
        _button_sizer->Add (_play_button, 0, wxEXPAND);
        _button_sizer->Add (_pause_button, 0, wxEXPAND);
        _button_sizer->Add (_stop_button, 0, wxEXPAND);
        _button_sizer->Add (_next_button, 0, wxEXPAND);
-       _button_sizer->Add (_previous_button, 0, wxEXPAND);
 
        _spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
        _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740);
@@ -90,7 +92,7 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
        _current_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
        _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 500);
        _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
-       e_sizer->Add (left_sizer, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
+       e_sizer->Add (left_sizer, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
        e_sizer->Add (_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
 
        _v_sizer->Add (e_sizer, 1, wxEXPAND);
@@ -106,6 +108,7 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
        _spl_view->Bind        (wxEVT_LIST_ITEM_SELECTED,   boost::bind(&SwaroopControls::spl_selection_changed, this));
        _spl_view->Bind        (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&SwaroopControls::spl_selection_changed, this));
        _viewer->Finished.connect (boost::bind(&SwaroopControls::viewer_finished, this));
+       _viewer->PositionChanged.connect (boost::bind(&SwaroopControls::viewer_position_changed, this));
        _refresh_spl_view->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::update_playlist_directory, this));
        _refresh_content_view->Bind (wxEVT_BUTTON, boost::bind(&ContentView::update, _content_view));
 
@@ -113,6 +116,49 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
        update_playlist_directory ();
 }
 
+void
+SwaroopControls::check_restart ()
+{
+       FILE* f = fopen_boost (Config::path("position"), "r");
+       if (!f) {
+               return;
+       }
+
+       char id[64];
+       int index;
+       int64_t time;
+       fscanf (f, "%63s %d %ld", id, &index, &time);
+
+       for (size_t i = 0; i < _playlists.size(); ++i) {
+               if (_playlists[i].id() == id) {
+                       _selected_playlist = i;
+                       _selected_playlist_position = index;
+                       update_current_content ();
+                       _viewer->seek (DCPTime(time), false);
+               }
+       }
+
+       fclose (f);
+}
+
+void
+SwaroopControls::viewer_position_changed ()
+{
+       if (!_selected_playlist || !_viewer->playing() || _viewer->position().get() % DCPTime::HZ) {
+               return;
+       }
+
+       FILE* f = fopen_boost (Config::path("position"), "w");
+       if (f) {
+               string const p = _playlists[*_selected_playlist].id()
+                       + " " + dcp::raw_convert<string>(_selected_playlist_position)
+                       + " " + dcp::raw_convert<string>(_viewer->position().get());
+
+               fwrite (p.c_str(), p.length(), 1, f);
+               fclose (f);
+       }
+}
+
 void
 SwaroopControls::started ()
 {
@@ -145,8 +191,8 @@ SwaroopControls::setup_sensitivity ()
        _pause_button->Enable (_viewer->playing());
        _slider->Enable (!_current_disable_timeline);
        _spl_view->Enable (!_viewer->playing());
-       _next_button->Enable (!_current_disable_next_previous && can_do_next());
-       _previous_button->Enable (!_current_disable_next_previous && can_do_previous());
+       _next_button->Enable (!_current_disable_next && can_do_next());
+       _previous_button->Enable (can_do_previous());
 }
 
 void
@@ -274,7 +320,6 @@ SwaroopControls::spl_selection_changed ()
                return;
        }
 
-
        _current_spl_view->DeleteAllItems ();
 
        int N = 0;
@@ -290,6 +335,7 @@ SwaroopControls::spl_selection_changed ()
        _selected_playlist = selected;
        _selected_playlist_position = 0;
        reset_film ();
+       update_current_content ();
 }
 
 void
@@ -325,15 +371,17 @@ SwaroopControls::update_current_content ()
 {
        DCPOMATIC_ASSERT (_selected_playlist);
 
-       _viewer->stop ();
+       bool const was_playing = _viewer->stop ();
 
        SPLEntry const & e = _playlists[*_selected_playlist].get()[_selected_playlist_position];
        _current_disable_timeline = e.disable_timeline;
-       _current_disable_next_previous = e.skippable;
+       _current_disable_next = !e.skippable;
 
        setup_sensitivity ();
        reset_film ();
-       _viewer->start ();
+       if (was_playing) {
+               _viewer->start ();
+       }
 }
 
 void