allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

Browse Source
This commit is contained in:
Paul Davis
2013-04-16 21:23:55 -04:00
parent 381d4debf4 930fce8696
commit 6a4cddbc4c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/video_image_frame.cc
View File

@@ -88,7 +88,7 @@ VideoImageFrame::reposition ()
void
VideoImageFrame::exposeimg () {
ImgChanged(); /* EMIT SIGNAL */
//ImgChanged(); /* EMIT SIGNAL */
}
void
@@ -129,8 +129,6 @@ VideoImageFrame::draw_line ()
void
VideoImageFrame::fill_frame (const uint8_t r, const uint8_t g, const uint8_t b)
{
memset((void*) img->data.get(), 0, img->stride * img->height); /// fill
const int rowstride = img->stride;
const int clip_height = img->height;
const int clip_width = img->width;

2
gtk2_ardour/video_image_frame.h
View File

@@ -81,7 +81,7 @@ class VideoImageFrame : public sigc::trackable
std::string video_filename;
double unit_position;
framepos_t frame_position;
framepos_t sample_position;
framepos_t video_frame_number;
void reposition ();