projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make dragging a region from the list not crash.
[ardour.git]
/
gtk2_ardour
/
video_timeline.h
diff --git
a/gtk2_ardour/video_timeline.h
b/gtk2_ardour/video_timeline.h
index dd61d2ef73c6646c4cfa7471c87f856d683ec532..03aaa902d8c52e56c81d1859458e38db9c7334de 100644
(file)
--- a/
gtk2_ardour/video_timeline.h
+++ b/
gtk2_ardour/video_timeline.h
@@
-29,7
+29,7
@@
#include "video_image_frame.h"
#include "video_monitor.h"
#include "pbd/signals.h"
#include "video_image_frame.h"
#include "video_monitor.h"
#include "pbd/signals.h"
-#include "canvas/
group
.h"
+#include "canvas/
container
.h"
namespace ARDOUR {
class Session;
namespace ARDOUR {
class Session;
@@
-55,7
+55,7
@@
class PublicEditor;
class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList, public PBD::StatefulDestructible
{
public:
class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList, public PBD::StatefulDestructible
{
public:
- VideoTimeLine (PublicEditor*, ArdourCanvas::
Group
*, int);
+ VideoTimeLine (PublicEditor*, ArdourCanvas::
Container
*, int);
virtual ~VideoTimeLine ();
void set_session (ARDOUR::Session *s);
virtual ~VideoTimeLine ();
void set_session (ARDOUR::Session *s);
@@
-102,11
+102,12
@@
class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
protected:
PublicEditor *editor;
protected:
PublicEditor *editor;
- ArdourCanvas::
Group
*videotl_group;
+ ArdourCanvas::
Container
*videotl_group;
int bar_height;
std::string _xjadeo_bin;
void find_xjadeo ();
int bar_height;
std::string _xjadeo_bin;
void find_xjadeo ();
+ void find_harvid ();
ARDOUR::frameoffset_t video_start_offset; /**< unit: audio-samples - video-file */
ARDOUR::frameoffset_t video_start_offset; /**< unit: audio-samples - video-file */
@@
-123,6
+124,11
@@
class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
std::string video_server_url;
std::string server_docroot;
std::string video_server_url;
std::string server_docroot;
+ void xjadeo_readversion (std::string d, size_t s);
+ void harvid_readversion (std::string d, size_t s);
+ std::string xjadeo_version;
+ std::string harvid_version;
+
typedef std::list<VideoImageFrame*> VideoFrames;
VideoFrames video_frames;
VideoImageFrame *get_video_frame (framepos_t vfn, int cut=0, int rightend = -1);
typedef std::list<VideoImageFrame*> VideoFrames;
VideoFrames video_frames;
VideoImageFrame *get_video_frame (framepos_t vfn, int cut=0, int rightend = -1);