_v_sizer->Add (e_sizer, 1, wxEXPAND);
- _log = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, 200), wxTE_READONLY | wxTE_MULTILINE);
- _v_sizer->Add (_log, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
_play_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::play_clicked, this));
_pause_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::pause_clicked, this));
_stop_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::stop_clicked, this));
void
SwaroopControls::viewer_position_changed ()
{
- if (!_selected_playlist || !_viewer->playing() || _viewer->position().get() % DCPTime::HZ) {
+ /* Write position every two minutes if we're playing */
+ if (!_selected_playlist || !_viewer->playing() || _viewer->position().get() % (2 * 60 * DCPTime::HZ)) {
return;
}
_viewer->set_background_image (false);
}
+/** Called when the viewer finishes a single piece of content, or it is explicitly stopped */
void
SwaroopControls::stopped ()
{
_pause_button->Enable (false);
}
+void
+SwaroopControls::deselect_playlist ()
+{
+ long int const selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (selected != -1) {
+ _selected_playlist = boost::none;
+ _spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED);
+ }
+ ResetFilm (shared_ptr<Film>(new Film(optional<boost::filesystem::path>())));
+}
+
void
SwaroopControls::decrement_allowed_shows ()
{
}
_viewer->set_background_image (true);
decrement_allowed_shows ();
+ deselect_playlist ();
}
bool
void
SwaroopControls::log (wxString s)
{
+ optional<boost::filesystem::path> log = Config::instance()->player_activity_log_file();
+ if (!log) {
+ return;
+ }
+
struct timeval time;
gettimeofday (&time, 0);
char buffer[64];
struct tm* t = localtime (&sec);
strftime (buffer, 64, "%c", t);
wxString ts = std_to_wx(string(buffer)) + N_(": ");
- _log->SetValue(_log->GetValue() + ts + s + "\n");
-
- optional<boost::filesystem::path> log = Config::instance()->player_activity_log_file();
- if (!log) {
+ FILE* f = fopen_boost (*log, "a");
+ if (!f) {
return;
}
-
- FILE* f = fopen_boost (*log, "a");
fprintf (f, "%s%s\n", wx_to_std(ts).c_str(), wx_to_std(s).c_str());
fclose (f);
}
if (_playlists[selected].missing()) {
error_dialog (this, "This playlist cannot be loaded as some content is missing.");
- _selected_playlist = boost::none;
- _spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED);
+ deselect_playlist ();
return;
}
}
if (dcp->needs_kdm()) {
/* We didn't get a KDM for this */
- error_dialog (this, "This playlist cannot be loaded as a KDM is missing.");
- _selected_playlist = boost::none;
- _spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED);
+ error_dialog (this, "This playlist cannot be loaded as a KDM is missing or incorrect.");
+ deselect_playlist ();
return;
}
}
ffmpeg->add_kdm (*kdm);
ffmpeg->examine (_film, shared_ptr<Job>());
} catch (KDMError& e) {
- error_dialog (this, "Could not load KDM.");
+ error_dialog (this, "This playlist cannot be loaded as a KDM is missing or incorrect.");
+ deselect_playlist ();
+ return;
}
} else {
- error_dialog (this, "This playlist cannot be loaded as a KDM is missing.");
- _selected_playlist = boost::none;
- _spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED);
+ error_dialog (this, "This playlist cannot be loaded as a KDM is missing or incorrect.");
+ deselect_playlist ();
return;
}
}
reset_film ();
}
+/** One piece of content in our SPL has finished playing */
void
SwaroopControls::viewer_finished ()
{
_selected_playlist_position++;
if (_selected_playlist_position < int(_playlists[*_selected_playlist].get().size())) {
+ /* Next piece of content on the SPL */
update_current_content ();
if (!stop) {
_viewer->start ();
}
} else {
+ /* Finished the whole SPL */
_selected_playlist_position = 0;
_viewer->set_background_image (true);
ResetFilm (shared_ptr<Film>(new Film(optional<boost::filesystem::path>())));
- stopped ();
+ decrement_allowed_shows ();
+ _play_button->Enable (true);
+ _pause_button->Enable (false);
}
-
- decrement_allowed_shows ();
}