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

vtl: get rid of one more unnecessary canvas-group

Browse Source
This commit is contained in:
Robin Gareus
2013-04-17 01:15:47 +02:00
parent 3d169d00bb
commit 1227f2b73e
5 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/editor.h
View File

@@ -895,7 +895,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
/* videtimline related actions */
ArdourCanvas::Rectangle* videotl_bar;
Gtk::Label videotl_label;
ArdourCanvas::Group* videotl_bar_group;
ArdourCanvas::Group* videotl_group;
Glib::RefPtr<Gtk::ToggleAction> ruler_video_action;
Glib::RefPtr<Gtk::ToggleAction> xjadeo_proc_action;

8
gtk2_ardour/editor_canvas.cc
View File

@@ -145,10 +145,8 @@ Editor::initialize_canvas ()
cd_marker_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, 0.0));
videotl_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple(0.0, 0.0));
videotl_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ());
videotl_bar = new ArdourCanvas::Rectangle (videotl_bar_group, ArdourCanvas::Rect (0.0, 0.0, 100,(timebar_height * videotl_bar_height)));
ARDOUR_UI::instance()->video_timeline = new VideoTimeLine(this, videotl_bar_group, (timebar_height * videotl_bar_height));
videotl_bar = new ArdourCanvas::Rectangle (videotl_group, ArdourCanvas::Rect (0.0, 0.0, 100,(timebar_height * videotl_bar_height)));
ARDOUR_UI::instance()->video_timeline = new VideoTimeLine(this, videotl_group, (timebar_height * videotl_bar_height));
cd_marker_bar_drag_rect = new ArdourCanvas::Rectangle (cd_marker_group, ArdourCanvas::Rect (0.0, 0.0, 100, timebar_height));
cd_marker_bar_drag_rect->set_outline (false);
@@ -193,7 +191,7 @@ Editor::initialize_canvas ()
meter_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar));
marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar));
cd_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar));
videotl_bar_group->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_videotl_bar_event), videotl_bar));
videotl_group->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_videotl_bar_event), videotl_bar));
range_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
transport_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));

8
gtk2_ardour/editor_rulers.cc
View File

@@ -781,11 +781,11 @@ Editor::update_ruler_visibility ()
if (tbpos != old_unit_pos) {
videotl_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
old_unit_pos = videotl_bar_group->position().y;
old_unit_pos = videotl_group->position().y;
if (tbgpos != old_unit_pos) {
videotl_bar_group->move (ArdourCanvas::Duple (0.0, tbgpos - old_unit_pos));
videotl_group->move (ArdourCanvas::Duple (0.0, tbgpos - old_unit_pos));
}
videotl_bar_group->show();
videotl_group->show();
videotl_group->show();
videotl_label.show();
tbpos += timebar_height * videotl_bar_height;
@@ -793,7 +793,7 @@ Editor::update_ruler_visibility ()
visible_timebars+=videotl_bar_height;
queue_visual_videotimeline_update();
} else {
videotl_bar_group->hide();
videotl_group->hide();
videotl_group->hide();
videotl_label.hide();
update_video_timeline(true);

4
gtk2_ardour/video_timeline.cc
View File

@@ -45,7 +45,7 @@ using namespace Timecode;
VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height)
: editor (ed)
, videotl_bar_group(vbg)
, videotl_group(vbg)
, bar_height(initial_height)
{
video_start_offset = 0L;
@@ -379,7 +379,7 @@ VideoTimeLine::update_video_timeline()
while (video_frames.size() < visible_video_frames) {
VideoImageFrame *frame;
frame = new VideoImageFrame(*editor, *videotl_bar_group, display_vframe_width, bar_height, video_server_url, translated_filename());
frame = new VideoImageFrame(*editor, *videotl_group, display_vframe_width, bar_height, video_server_url, translated_filename());
frame->ImgChanged.connect (*this, invalidator (*this), boost::bind (&PublicEditor::queue_visual_videotimeline_update, editor), gui_context());
video_frames.push_back(frame);
}

2
gtk2_ardour/video_timeline.h
View File

@@ -101,7 +101,7 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
protected:
PublicEditor *editor;
ArdourCanvas::Group *videotl_bar_group;
ArdourCanvas::Group *videotl_group;
int bar_height;
std::string _xjadeo_bin;