#include <list>
#include <wx/graphics.h>
#include <boost/weak_ptr.hpp>
-#include "film.h"
+#include "lib/film.h"
+#include "lib/playlist.h"
#include "film_editor.h"
#include "timeline.h"
#include "wx_util.h"
-#include "lib/playlist.h"
using std::list;
using std::cout;
using boost::dynamic_pointer_cast;
using boost::bind;
-class View
+class View : public boost::noncopyable
{
public:
View (Timeline& t)
- : _timeline (t)
+ : _timeline (t)
{
}
_timeline.force_redraw (bbox ());
}
- virtual Rect bbox () const = 0;
+ virtual dcpomatic::Rect<int> bbox () const = 0;
protected:
virtual void do_paint (wxGraphicsContext *) = 0;
Timeline& _timeline;
private:
- Rect _last_paint_bbox;
+ dcpomatic::Rect<int> _last_paint_bbox;
};
class ContentView : public View
_content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2));
}
- Rect bbox () const
+ dcpomatic::Rect<int> bbox () const
{
shared_ptr<const Film> film = _timeline.film ();
- shared_ptr<const Content> content = _content.lock ();
- if (!film || !content) {
- return Rect ();
+ if (!film) {
+ return dcpomatic::Rect<int> ();
}
- return Rect (
- time_x (content->start ()) - 8,
+ return dcpomatic::Rect<int> (
+ 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
);
}
return _selected;
}
- weak_ptr<Content> content () const {
+ shared_ptr<Content> content () const {
return _content;
}
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);
gc->SetPen (*wxBLACK_PEN);
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 4, wxPENSTYLE_SOLID));
if (_selected) {
gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (selected, wxBRUSHSTYLE_SOLID));
} else {
gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxBRUSHSTYLE_SOLID));
}
-#else
- gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 4, wxSOLID));
- if (_selected) {
- gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (selected, wxSOLID));
- } else {
- gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxSOLID));
- }
-#endif
-
+
wxGraphicsPath path = gc->CreatePath ();
- path.MoveToPoint (time_x (start), y_pos (_track) + 4);
+ path.MoveToPoint (time_x (start), y_pos (_track) + 4);
path.AddLineToPoint (time_x (start + len), y_pos (_track) + 4);
path.AddLineToPoint (time_x (start + len), y_pos (_track + 1) - 4);
- path.AddLineToPoint (time_x (start), y_pos (_track + 1) - 4);
- path.AddLineToPoint (time_x (start), y_pos (_track) + 4);
+ path.AddLineToPoint (time_x (start), y_pos (_track + 1) - 4);
+ path.AddLineToPoint (time_x (start), y_pos (_track) + 4);
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;
}
}
- 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;
{
public:
TimeAxisView (Timeline& tl, int y)
- : View (tl)
+ : View (tl)
, _y (y)
{}
- Rect bbox () const
+ dcpomatic::Rect<int> bbox () const
{
- return Rect (0, _y - 4, _timeline.width(), 24);
+ return dcpomatic::Rect<int> (0, _y - 4, _timeline.width(), 24);
}
void set_y (int y)
void do_paint (wxGraphicsContext* gc)
{
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID));
-#else
- gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxSOLID));
-#endif
int mark_interval = rint (128 / (TIME_HZ * _timeline.pixels_per_time_unit ()));
if (mark_interval > 5) {
, _down_view_start (0)
, _first_move (false)
{
+#ifndef __WXOSX__
SetDoubleBuffered (true);
+#endif
setup_pixels_per_time_unit ();
_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)) {
continue;
}
- shared_ptr<Content> acv_content = acv->content().lock ();
- assert (acv_content);
+ shared_ptr<Content> acv_content = acv->content();
int t = 1;
while (1) {
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;
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
Timeline::left_down (wxMouseEvent& ev)
{
list<shared_ptr<View> >::iterator i = _views.begin();
- Position const p (ev.GetX(), ev.GetY());
+ Position<int> const p (ev.GetX(), ev.GetY());
while (i != _views.end() && !(*i)->bbox().contains (p)) {
++i;
}
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 ();
}
}
_left_down = true;
_down_point = ev.GetPosition ();
_first_move = false;
+
+ if (_down_view) {
+ _down_view->content()->set_change_signals_frequent (true);
+ }
}
void
-Timeline::left_up (wxMouseEvent &)
+Timeline::left_up (wxMouseEvent& ev)
{
_left_down = false;
+
+ if (_down_view) {
+ _down_view->content()->set_change_signals_frequent (false);
+ }
+
+ set_start_from_event (ev);
}
void
return;
}
+ set_start_from_event (ev);
+}
+
+void
+Timeline::set_start_from_event (wxMouseEvent& ev)
+{
wxPoint const p = ev.GetPosition();
if (!_first_move) {
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);
}
}
void
-Timeline::force_redraw (Rect const & r)
+Timeline::force_redraw (dcpomatic::Rect<int> const & r)
{
RefreshRect (wxRect (r.x, r.y, r.width, r.height), false);
}
projects / dcpomatic.git / blobdiff