smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Paul Davis 2013-04-11 22:54:22 -04:00
commit f208593249
56 changed files with 58 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/editor.h
View file

@ -785,9 +785,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
ruler_time_range_marker = 7,
ruler_time_transport_marker = 8,
ruler_time_cd_marker = 9,
#ifdef WITH_VIDEOTIMELINE
ruler_video_timeline = 10,
#endif
};
static GtkCustomMetric ruler_metrics[4];
@ -921,8 +919,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
Gtk::Label transport_mark_label;
Gtk::Label cd_mark_label;
#ifdef WITH_VIDEOTIMELINE
ArdourCanvas::Rectangle* videotl_bar;
/* videtimline related actions */
ArdourCanvas::Rectangle* videotl_bar;
Gtk::Label videotl_label;
ArdourCanvas::Group* videotl_bar_group;
ArdourCanvas::Group* videotl_group;
@ -945,7 +943,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
int get_videotl_bar_height () const { return videotl_bar_height; }
void export_video ();
void toggle_region_video_lock ();
#endif
Gtk::VBox time_bars_vbox;
@ -1453,7 +1450,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
bool canvas_cd_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
#ifdef WITH_VIDEOTIMELINE
bool canvas_videotl_bar_event (GdkEvent* event, ArdourCanvas::Item*);
void update_video_timeline (bool flush = false);
void set_video_timeline_height (const int);
@ -1462,7 +1459,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void set_video_timeline_locked (const bool);
void queue_visual_videotimeline_update ();
void embed_audio_from_video (std::string, framepos_t n = 0);
#endif
bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*);
bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*);
@ -2180,9 +2176,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
friend class RegionCreateDrag;
friend class RegionMotionDrag;
friend class RegionInsertDrag;
#ifdef WITH_VIDEOTIMELINE
friend class VideoTimeLineDrag;
#endif
friend class EditorSummary;
friend class EditorGroupTabs;