projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More sensible default size / position for .srt subs.
[dcpomatic.git]
/
src
/
wx
/
timeline.cc
diff --git
a/src/wx/timeline.cc
b/src/wx/timeline.cc
index d728bd47c11349b5dea1ed079e0b6cefb3c397d3..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 "lib/image_content.h"
#include "film_editor.h"
#include "timeline.h"
+#include "content_panel.h"
#include "wx_util.h"
using std::list;
#include "wx_util.h"
using std::list;
@@
-212,6
+213,9
@@
private:
boost::signals2::scoped_connection _content_connection;
};
boost::signals2::scoped_connection _content_connection;
};
+/** @class AudioContentView
+ * @brief Timeline view for AudioContent.
+ */
class AudioContentView : public ContentView
{
public:
class AudioContentView : public ContentView
{
public:
@@
-236,6
+240,9
@@
private:
}
};
}
};
+/** @class AudioContentView
+ * @brief Timeline view for VideoContent.
+ */
class VideoContentView : public ContentView
{
public:
class VideoContentView : public ContentView
{
public:
@@
-265,6
+272,9
@@
private:
}
};
}
};
+/** @class AudioContentView
+ * @brief Timeline view for SubtitleContent.
+ */
class SubtitleContentView : public ContentView
{
public:
class SubtitleContentView : public ContentView
{
public: