Merge master.

[dcpomatic.git] / src / wx / timeline.cc

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 6141c8eedcef75abd352a424d36355f8fe1394d2..13baef6b7bb0c143021aeb67a97fe7dcc714127e 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -25,6 +25,7 @@
 #include "lib/image_content.h"
 #include "film_editor.h"
 #include "timeline.h"
+#include "content_panel.h"
 #include "wx_util.h"
 
 using std::list;
@@ -212,6 +213,9 @@ private:
        boost::signals2::scoped_connection _content_connection;
 };
 
+/** @class AudioContentView
+ *  @brief Timeline view for AudioContent.
+ */
 class AudioContentView : public ContentView
 {
 public:
@@ -236,6 +240,9 @@ private:
        }
 };
 
+/** @class AudioContentView
+ *  @brief Timeline view for VideoContent.
+ */
 class VideoContentView : public ContentView
 {
 public:
@@ -265,6 +272,9 @@ private:
        }
 };
 
+/** @class AudioContentView
+ *  @brief Timeline view for SubtitleContent.
+ */
 class SubtitleContentView : public ContentView
 {
 public:
@@ -394,9 +404,9 @@ private:
 };
 
 
-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)
@@ -603,7 +613,7 @@ Timeline::left_down (wxMouseEvent& ev)
                }
                
                if (view == *i) {
-                       _film_editor->set_selection (cv->content ());
+                       _content_panel->set_selection (cv->content ());
                }
        }