projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
properly handle meter channel count changes
[ardour.git]
/
gtk2_ardour
/
video_image_frame.h
diff --git
a/gtk2_ardour/video_image_frame.h
b/gtk2_ardour/video_image_frame.h
index 6988274d7e136d86954c2addc7aa1690054ce162..aeb117da9f8d0d74127f4ab07de0ac091d746732 100644
(file)
--- a/
gtk2_ardour/video_image_frame.h
+++ b/
gtk2_ardour/video_image_frame.h
@@
-17,14
+17,9
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifdef WITH_VIDEOTIMELINE
-
#ifndef __ardour_video_image_frame_h__
#define __ardour_video_image_frame_h__
#ifndef __ardour_video_image_frame_h__
#define __ardour_video_image_frame_h__
-#define ARDOUR_USER_AGENT (PROGRAM_NAME VERSIONSTRING)
-#define ARDOUR_CURL_TIMEOUT (60)
-
#include <string>
#include <glib.h>
#include <string>
#include <glib.h>
@@
-34,7
+29,9
@@
#include "ardour/ardour.h"
#include "pbd/signals.h"
#include "ardour/ardour.h"
#include "pbd/signals.h"
-#include "canvas.h"
+#include "canvas/container.h"
+#include "canvas/pixbuf.h"
+#include "canvas/image.h"
namespace ARDOUR {
class TempoSection;
namespace ARDOUR {
class TempoSection;
@@
-49,7
+46,7
@@
class PublicEditor;
class VideoImageFrame : public sigc::trackable
{
public:
class VideoImageFrame : public sigc::trackable
{
public:
- VideoImageFrame (PublicEditor&, ArdourCanvas::
Group
&, int, int, std::string, std::string);
+ VideoImageFrame (PublicEditor&, ArdourCanvas::
Container
&, int, int, std::string, std::string);
virtual ~VideoImageFrame ();
void set_position (framepos_t);
virtual ~VideoImageFrame ();
void set_position (framepos_t);
@@
-69,9
+66,9
@@
class VideoImageFrame : public sigc::trackable
protected:
PublicEditor& editor;
protected:
PublicEditor& editor;
- ArdourCanvas::
Group
*_parent;
- ArdourCanvas::
Group *group
;
-
ArdourCanvas::Pixbuf *img_pixbuf
;
+ ArdourCanvas::
Container
*_parent;
+ ArdourCanvas::
Image *image
;
+
boost::shared_ptr<ArdourCanvas::Image::Data> img
;
int clip_width;
int clip_height;
int clip_width;
int clip_height;
@@
-81,13
+78,15
@@
class VideoImageFrame : public sigc::trackable
std::string video_filename;
double unit_position;
std::string video_filename;
double unit_position;
- framepos_t
fram
e_position;
+ framepos_t
sampl
e_position;
framepos_t video_frame_number;
void reposition ();
void exposeimg ();
framepos_t video_frame_number;
void reposition ();
void exposeimg ();
+ void fill_frame (const uint8_t r, const uint8_t g, const uint8_t b);
void draw_line ();
void draw_line ();
+ void draw_x ();
void cut_rightend ();
void cut_rightend ();
@@
-106,10
+105,4
@@
class VideoImageFrame : public sigc::trackable
};
};
-extern "C" {
- char *curl_http_get (const char *u, int *status);
-}
-
#endif /* __ardour_video_image_frame_h__ */
#endif /* __ardour_video_image_frame_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */