#include "lib/image_content.h"
#include "film_editor.h"
#include "timeline.h"
+#include "content_panel.h"
#include "wx_util.h"
using std::list;
boost::signals2::scoped_connection _content_connection;
};
+/** @class AudioContentView
+ * @brief Timeline view for AudioContent.
+ */
class AudioContentView : public ContentView
{
public:
}
};
+/** @class AudioContentView
+ * @brief Timeline view for VideoContent.
+ */
class VideoContentView : public ContentView
{
public:
}
};
+/** @class AudioContentView
+ * @brief Timeline view for SubtitleContent.
+ */
class SubtitleContentView : public ContentView
{
public:
};
-Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film)
+Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
- , _film_editor (ed)
+ , _content_panel (cp)
, _film (film)
, _time_axis_view (new TimeAxisView (*this, 32))
, _tracks (0)
}
if (view == *i) {
- _film_editor->set_selection (cv->content ());
+ _content_panel->set_selection (cv->content ());
}
}
DCPTime const d = DCPTime (cv->content()->end() - new_position).abs ();
if (first || d < nearest_distance) {
nearest_distance = d;
- nearest_new_position = cv->content()->end();
+ nearest_new_position = cv->content()->end() + DCPTime::delta ();
}
}
if (d < nearest_distance) {
nearest_distance = d;
- nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim ();
+ nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim () - DCPTime::delta();
}
}