projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Gnome::Canvas -> ArdourCanvas and some other small fixes
[ardour.git]
/
gtk2_ardour
/
imageframe_view.h
diff --git
a/gtk2_ardour/imageframe_view.h
b/gtk2_ardour/imageframe_view.h
index efc315428220aca45454920982a683e4058ec6b1..d6f436d744fb84adb0e08b33bf3c90a36445f596 100644
(file)
--- a/
gtk2_ardour/imageframe_view.h
+++ b/
gtk2_ardour/imageframe_view.h
@@
-23,7
+23,7
@@
#include <string>
#include <gtkmm.h>
#include <string>
#include <gtkmm.h>
-#include <
gtk-
canvas.h>
+#include <
libgnomecanvas/libgnome
canvas.h>
#include <sigc++/signal.h>
#include <list>
#include <sigc++/signal.h>
#include <list>
@@
-60,11
+60,11
@@
class ImageFrameView : public TimeAxisViewItem
* @param num_channels the number of color channels within rgb_data
*/
ImageFrameView(std::string item_id,
* @param num_channels the number of color channels within rgb_data
*/
ImageFrameView(std::string item_id,
-
GtkCanvas
Group *parent,
+
ArdourCanvas::
Group *parent,
ImageFrameTimeAxis *tv,
ImageFrameTimeAxisGroup* group,
double spu,
ImageFrameTimeAxis *tv,
ImageFrameTimeAxisGroup* group,
double spu,
- GdkColor& base_color,
+ Gdk
::
Color& base_color,
jack_nframes_t start,
jack_nframes_t duration,
unsigned char* rgb_data,
jack_nframes_t start,
jack_nframes_t duration,
unsigned char* rgb_data,
@@
-205,7
+205,7
@@
class ImageFrameView : public TimeAxisViewItem
// ------- Our canvas element -----------
/** the CanvasImageFrame to display the image */
// ------- Our canvas element -----------
/** the CanvasImageFrame to display the image */
- G
tk
CanvasItem* imageframe ;
+ G
nome
CanvasItem* imageframe ;
} ; /* class ImageFrameView */
} ; /* class ImageFrameView */