summaryrefslogtreecommitdiff
path: root/gtk2_ardour/video_timeline.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-06-07 15:35:49 +0200
committerRobin Gareus <robin@gareus.org>2013-06-07 15:35:49 +0200
commitb13c5bff54799374ddeced0325f641e5ce449165 (patch)
tree5514d759098099fb76ee9c496b37a813e06b097d /gtk2_ardour/video_timeline.cc
parent31fbf351a818ed860e82280467a23b7d9f59c107 (diff)
vtl: NOOP - clean up code.
Diffstat (limited to 'gtk2_ardour/video_timeline.cc')
-rw-r--r--gtk2_ardour/video_timeline.cc55
1 files changed, 26 insertions, 29 deletions
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 743bc3216c..d8e129a2de 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -150,44 +150,41 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
return;
}
- if (node) {
- ARDOUR_UI::instance()->start_video_server((Gtk::Window*)0, false);
+ ARDOUR_UI::instance()->start_video_server((Gtk::Window*)0, false);
- set_id(*node);
+ set_id(*node);
- const XMLProperty* proph = node->property (X_("Height"));
- if (proph) {
- editor->set_video_timeline_height(atoi(proph->value().c_str()));
- }
+ const XMLProperty* proph = node->property (X_("Height"));
+ if (proph) {
+ editor->set_video_timeline_height(atoi(proph->value().c_str()));
+ }
#if 0 /* TODO THINK: set FPS first time only ?! */
- const XMLProperty* propasfps = node->property (X_("AutoFPS"));
- if (propasfps) {
- auto_set_session_fps = atoi(propasfps->value().c_str())?true:false;
- }
+ const XMLProperty* propasfps = node->property (X_("AutoFPS"));
+ if (propasfps) {
+ auto_set_session_fps = atoi(propasfps->value().c_str())?true:false;
+ }
#endif
- const XMLProperty* propoffset = node->property (X_("VideoOffset"));
- if (propoffset) {
- video_offset = atoll(propoffset->value().c_str());
- video_offset_p = video_offset;
- }
-
- const XMLProperty* proplock = node->property (X_("VideoOffsetLock"));
- if (proplock) {
- video_offset_lock = atoi(proplock->value().c_str())?true:false;
- }
+ const XMLProperty* propoffset = node->property (X_("VideoOffset"));
+ if (propoffset) {
+ video_offset = atoll(propoffset->value().c_str());
+ video_offset_p = video_offset;
+ }
- const XMLProperty* localfile = node->property (X_("LocalFile"));
- if (localfile) {
- local_file = atoi(localfile->value().c_str())?true:false;
- }
+ const XMLProperty* proplock = node->property (X_("VideoOffsetLock"));
+ if (proplock) {
+ video_offset_lock = atoi(proplock->value().c_str())?true:false;
+ }
- const XMLProperty* propf = node->property (X_("Filename"));
- video_file_info(propf->value(), local_file);
+ const XMLProperty* localfile = node->property (X_("LocalFile"));
+ if (localfile) {
+ local_file = atoi(localfile->value().c_str())?true:false;
}
- node = _session->extra_xml (X_("Videomonitor"));
- if (node) {
+ const XMLProperty* propf = node->property (X_("Filename"));
+ video_file_info(propf->value(), local_file);
+
+ if ((node = _session->extra_xml (X_("Videomonitor")))) {
const XMLProperty* prop = node->property (X_("active"));
if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
open_video_monitor();