More Controls API tweaks.

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 497182dde2a63abf6b3f586960ab9a0d7a17b82a..e0112764fed6c814666a80e4faf720002aa5537d 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -585,7 +585,7 @@ private:
        void setup_screen ()
        {
                _controls->Show (_mode != Config::PLAYER_MODE_FULL);
-               _controls->show_dcp_directory (_mode == Config::PLAYER_MODE_DUAL);
+               _controls->show_extended_player_controls (_mode == Config::PLAYER_MODE_DUAL);
                _info->Show (_mode != Config::PLAYER_MODE_FULL);
                _overall_panel->SetBackgroundColour (_mode == Config::PLAYER_MODE_FULL ? wxColour(0, 0, 0) : wxNullColour);
                ShowFullScreen (_mode == Config::PLAYER_MODE_FULL);

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 4ad1f6c237ec677ec276469cb37cdadef6bf71d9..e96d8055e262a73152ed3ee75554ab384ce8b4b0 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -33,7 +33,7 @@ using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
 
-Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls, bool dcp_directory)
+Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
        : wxPanel (parent)
        , _viewer (viewer)
        , _slider_being_moved (false)
@@ -76,7 +76,7 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
        _dcp_directory = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize(600, -1), wxLC_REPORT | wxLC_NO_HEADER);
        _dcp_directory->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580);
        _v_sizer->Add (_dcp_directory, 0, wxALL, DCPOMATIC_SIZER_GAP);
-       _dcp_directory->Show (dcp_directory);
+       _dcp_directory->Show (false);
 
        wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
 
@@ -446,7 +446,7 @@ Controls::film () const
 }
 
 void
-Controls::show_dcp_directory (bool s)
+Controls::show_extended_player_controls (bool s)
 {
        _dcp_directory->Show (s);
 }

diff --git a/src/wx/controls.h b/src/wx/controls.h
index 5cfe96e3dc85079cfc6429a1b96f29e832c96556..bd87d658b62d9ba81eee8c854f95e595ab3ed094 100644 (file)
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -39,15 +39,14 @@ public:
        Controls (
                wxWindow* parent,
                boost::shared_ptr<FilmViewer>,
-               bool editor_controls = true,
-               bool dcp_directory = false
+               bool editor_controls = true
                );
 
        boost::shared_ptr<Film> film () const;
        void back_frame ();
        void forward_frame ();
 
-       void show_dcp_directory (bool s);
+       void show_extended_player_controls (bool s);
 
        boost::signals2::signal<void (boost::filesystem::path)> DCPDirectorySelected;
        boost::signals2::signal<void ()> DCPEjected;