summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-19 11:41:47 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-19 11:41:47 +0100
commit91273da19c689e44f3baa368d4b4efbe75cd8fe5 (patch)
treeb38e643c9de71b16168128a7f2f00ccb75009605 /src/wx
parentd6b125826e28c0633137d667371defc33f95f648 (diff)
parentba17803f7e33be2bea1363b5a7115e4713dd5997 (diff)
Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/film_editor.cc14
-rw-r--r--src/wx/film_viewer.cc8
-rw-r--r--src/wx/properties_dialog.cc8
-rw-r--r--src/wx/timecode.cc29
-rw-r--r--src/wx/timecode.h5
-rw-r--r--src/wx/timeline.cc73
6 files changed, 68 insertions, 69 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 8f391f5cd..427afb6e8 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -757,9 +757,6 @@ FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property)
_subtitle_stream->Clear ();
if (ffmpeg_content) {
vector<shared_ptr<FFmpegSubtitleStream> > s = ffmpeg_content->subtitle_streams ();
- if (s.empty ()) {
- _subtitle_stream->Enable (false);
- }
for (vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) {
_subtitle_stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id))));
}
@@ -893,8 +890,8 @@ FilmEditor::set_film (shared_ptr<Film> f)
film_changed (Film::DCP_VIDEO_FRAME_RATE);
film_changed (Film::DCP_AUDIO_CHANNELS);
- if (!_film->content().empty ()) {
- set_selection (_film->content().front ());
+ if (!_film->content_without_loop().empty ()) {
+ set_selection (_film->content_without_loop().front ());
}
wxListEvent ev;
@@ -1061,6 +1058,7 @@ FilmEditor::setup_subtitle_control_sensitivity ()
_subtitle_offset->Enable (j);
_subtitle_scale->Enable (j);
+ _subtitle_stream->Enable (j);
}
void
@@ -1154,7 +1152,7 @@ FilmEditor::setup_content ()
_content->DeleteAllItems ();
- Playlist::ContentList content = _film->content ();
+ Playlist::ContentList content = _film->content_without_loop ();
for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
int const t = _content->GetItemCount ();
_content->InsertItem (t, std_to_wx ((*i)->summary ()));
@@ -1262,7 +1260,7 @@ FilmEditor::selected_content ()
return shared_ptr<Content> ();
}
- Playlist::ContentList c = _film->content ();
+ Playlist::ContentList c = _film->content_without_loop ();
if (s < 0 || size_t (s) >= c.size ()) {
return shared_ptr<Content> ();
}
@@ -1512,7 +1510,7 @@ FilmEditor::length_changed ()
void
FilmEditor::set_selection (weak_ptr<Content> wc)
{
- Playlist::ContentList content = _film->content ();
+ Playlist::ContentList content = _film->content_without_loop ();
for (size_t i = 0; i < content.size(); ++i) {
if (content[i] == wc.lock ()) {
_content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 1fa7bdb91..d00a582e5 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -164,8 +164,10 @@ FilmViewer::timer (wxTimerEvent &)
fetch_next_frame ();
- if (_film->length()) {
- int const new_slider_position = 4096 * _player->video_position() / _film->length();
+ Time const len = _film->length_with_loop ();
+
+ if (len) {
+ int const new_slider_position = 4096 * _player->video_position() / len;
if (new_slider_position != _slider->GetValue()) {
_slider->SetValue (new_slider_position);
}
@@ -211,7 +213,7 @@ void
FilmViewer::slider_moved (wxScrollEvent &)
{
if (_film && _player) {
- _player->seek (_slider->GetValue() * _film->length() / 4096, false);
+ _player->seek (_slider->GetValue() * _film->length_with_loop() / 4096, false);
fetch_next_frame ();
}
}
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index d525fe38b..b8d97cb59 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -50,8 +50,8 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
- _frames->SetLabel (std_to_wx (lexical_cast<string> (_film->time_to_video_frames (_film->length()))));
- double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length() / (TIME_HZ * 1073741824.0f);
+ _frames->SetLabel (std_to_wx (lexical_cast<string> (_film->time_to_video_frames (_film->length_with_loop()))));
+ double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length_with_loop() / (TIME_HZ * 1073741824.0f);
stringstream s;
s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
_disk->SetLabel (std_to_wx (s.str ()));
@@ -78,9 +78,9 @@ PropertiesDialog::frames_already_encoded () const
return "";
}
- if (_film->length()) {
+ if (_film->length_with_loop()) {
/* XXX: encoded_frames() should check which frames have been encoded */
- u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length())) << "%)";
+ u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length_with_loop())) << "%)";
}
return u.str ();
}
diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 6ce1c1cb8..82c27c5b5 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -18,6 +18,7 @@
*/
#include <boost/lexical_cast.hpp>
+#include "lib/util.h"
#include "timecode.h"
#include "wx_util.h"
@@ -27,7 +28,6 @@ using boost::lexical_cast;
Timecode::Timecode (wxWindow* parent)
: wxPanel (parent)
- , _in_set (false)
{
wxClientDC dc (parent);
wxSize size = dc.GetTextExtent (wxT ("9999"));
@@ -48,31 +48,34 @@ Timecode::Timecode (wxWindow* parent)
_hours->SetMaxLength (2);
sizer->Add (_hours);
add_label_to_sizer (sizer, this, wxT (":"), false);
- _minutes = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
+ _minutes = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
_minutes->SetMaxLength (2);
sizer->Add (_minutes);
add_label_to_sizer (sizer, this, wxT (":"), false);
- _seconds = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
+ _seconds = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
_seconds->SetMaxLength (2);
sizer->Add (_seconds);
add_label_to_sizer (sizer, this, wxT ("."), false);
- _frames = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
+ _frames = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
_frames->SetMaxLength (2);
sizer->Add (_frames);
+ _set_button = new wxButton (this, wxID_ANY, _("Set"));
+ sizer->Add (_set_button, 0, wxLEFT | wxRIGHT, 8);
_hours->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
_minutes->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
_seconds->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
_frames->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
+ _set_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (Timecode::set_clicked), 0, this);
+ _set_button->Enable (false);
+
SetSizerAndFit (sizer);
}
void
Timecode::set (Time t, int fps)
{
- _in_set = true;
-
int const h = t / (3600 * TIME_HZ);
t -= h * 3600 * TIME_HZ;
int const m = t / (60 * TIME_HZ);
@@ -85,8 +88,6 @@ Timecode::set (Time t, int fps)
_minutes->SetValue (wxString::Format (wxT ("%d"), m));
_seconds->SetValue (wxString::Format (wxT ("%d"), s));
_frames->SetValue (wxString::Format (wxT ("%d"), f));
-
- _in_set = false;
}
Time
@@ -101,15 +102,19 @@ Timecode::get (int fps) const
t += lexical_cast<int> (s.empty() ? "0" : s) * TIME_HZ;
string const f = wx_to_std (_frames->GetValue());
t += lexical_cast<int> (f.empty() ? "0" : f) * TIME_HZ / fps;
+
return t;
}
void
Timecode::changed (wxCommandEvent &)
{
- if (_in_set) {
- return;
- }
-
+ _set_button->Enable (true);
+}
+
+void
+Timecode::set_clicked (wxCommandEvent &)
+{
Changed ();
+ _set_button->Enable (false);
}
diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 9b6fe6654..ca6deb969 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -33,11 +33,12 @@ public:
private:
void changed (wxCommandEvent &);
+ void set_clicked (wxCommandEvent &);
wxTextCtrl* _hours;
wxTextCtrl* _minutes;
wxTextCtrl* _seconds;
wxTextCtrl* _frames;
-
- bool _in_set;
+ wxButton* _set_button;
};
+
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index ff10b7d91..3747a3dac 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -34,7 +34,7 @@ using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::bind;
-class View
+class View : public boost::noncopyable
{
public:
View (Timeline& t)
@@ -86,15 +86,14 @@ public:
dcpomatic::Rect<int> bbox () const
{
shared_ptr<const Film> film = _timeline.film ();
- shared_ptr<const Content> content = _content.lock ();
- if (!film || !content) {
+ if (!film) {
return dcpomatic::Rect<int> ();
}
return dcpomatic::Rect<int> (
- time_x (content->start ()) - 8,
+ time_x (_content->start ()) - 8,
y_pos (_track) - 8,
- content->length () * _timeline.pixels_per_time_unit() + 16,
+ _content->length () * _timeline.pixels_per_time_unit() + 16,
_timeline.track_height() + 16
);
}
@@ -108,7 +107,7 @@ public:
return _selected;
}
- weak_ptr<Content> content () const {
+ shared_ptr<Content> content () const {
return _content;
}
@@ -128,13 +127,12 @@ private:
void do_paint (wxGraphicsContext* gc)
{
shared_ptr<const Film> film = _timeline.film ();
- shared_ptr<const Content> content = _content.lock ();
- if (!film || !content) {
+ if (!film) {
return;
}
- Time const start = content->start ();
- Time const len = content->length ();
+ Time const start = _content->start ();
+ Time const len = _content->length ();
wxColour selected (colour().Red() / 2, colour().Green() / 2, colour().Blue() / 2);
@@ -146,7 +144,7 @@ private:
} else {
gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxBRUSHSTYLE_SOLID));
}
-
+
wxGraphicsPath path = gc->CreatePath ();
path.MoveToPoint (time_x (start), y_pos (_track) + 4);
path.AddLineToPoint (time_x (start + len), y_pos (_track) + 4);
@@ -156,7 +154,7 @@ private:
gc->StrokePath (path);
gc->FillPath (path);
- wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (content->file().filename().string()).data(), type().data());
+ wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (_content->file().filename().string()).data(), type().data());
wxDouble name_width;
wxDouble name_height;
wxDouble name_descent;
@@ -180,7 +178,11 @@ private:
}
}
- boost::weak_ptr<Content> _content;
+ /* This must be a shared_ptr, not a weak_ptr, as in the looped case this
+ will be the only remaining pointer to the looped content that we get
+ from the playlist.
+ */
+ boost::shared_ptr<Content> _content;
int _track;
bool _selected;
@@ -217,7 +219,11 @@ private:
wxString type () const
{
- return _("video");
+ if (dynamic_pointer_cast<FFmpegContent> (content ())) {
+ return _("video");
+ } else {
+ return _("still");
+ }
}
wxColour colour () const
@@ -369,7 +375,7 @@ Timeline::playlist_changed ()
_views.clear ();
- Playlist::ContentList content = fl->playlist()->content ();
+ Playlist::ContentList content = fl->playlist()->content_with_loop ();
for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
if (dynamic_pointer_cast<VideoContent> (*i)) {
@@ -401,8 +407,7 @@ Timeline::assign_tracks ()
continue;
}
- shared_ptr<Content> acv_content = acv->content().lock ();
- assert (acv_content);
+ shared_ptr<Content> acv_content = acv->content();
int t = 1;
while (1) {
@@ -414,12 +419,11 @@ Timeline::assign_tracks ()
continue;
}
- shared_ptr<Content> test_content = test->content().lock ();
- assert (test_content);
+ shared_ptr<Content> test_content = test->content();
if (test && test->track() == t) {
- if ((acv_content->start() <= test_content->start() && test_content->start() <= acv_content->end()) ||
- (acv_content->start() <= test_content->end() && test_content->end() <= acv_content->end())) {
+ if ((acv_content->start() < test_content->start() && test_content->start() < acv_content->end()) ||
+ (acv_content->start() < test_content->end() && test_content->end() < acv_content->end())) {
/* we have an overlap on track `t' */
++t;
break;
@@ -456,7 +460,7 @@ Timeline::setup_pixels_per_time_unit ()
return;
}
- _pixels_per_time_unit = static_cast<double>(width() - x_offset() * 2) / film->length();
+ _pixels_per_time_unit = static_cast<double>(width() - x_offset() * 2) / film->length_with_loop();
}
void
@@ -474,9 +478,7 @@ Timeline::left_down (wxMouseEvent& ev)
shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
if (cv) {
_down_view = cv;
- shared_ptr<Content> c = cv->content().lock();
- assert (c);
- _down_view_start = c->start ();
+ _down_view_start = cv->content()->start ();
}
}
@@ -495,10 +497,7 @@ Timeline::left_down (wxMouseEvent& ev)
_first_move = false;
if (_down_view) {
- shared_ptr<Content> c = _down_view->content().lock ();
- if (c) {
- c->set_change_signals_frequent (true);
- }
+ _down_view->content()->set_change_signals_frequent (true);
}
}
@@ -508,10 +507,7 @@ Timeline::left_up (wxMouseEvent& ev)
_left_down = false;
if (_down_view) {
- shared_ptr<Content> c = _down_view->content().lock ();
- if (c) {
- c->set_change_signals_frequent (false);
- }
+ _down_view->content()->set_change_signals_frequent (false);
}
set_start_from_event (ev);
@@ -542,14 +538,11 @@ Timeline::set_start_from_event (wxMouseEvent& ev)
Time const time_diff = (p.x - _down_point.x) / _pixels_per_time_unit;
if (_down_view) {
- shared_ptr<Content> c = _down_view->content().lock();
- if (c) {
- c->set_start (max (static_cast<Time> (0), _down_view_start + time_diff));
+ _down_view->content()->set_start (max (static_cast<Time> (0), _down_view_start + time_diff));
- shared_ptr<Film> film = _film.lock ();
- assert (film);
- film->set_sequence_video (false);
- }
+ shared_ptr<Film> film = _film.lock ();
+ assert (film);
+ film->set_sequence_video (false);
}
}