summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/SConscript2
-rw-r--r--libs/ardour/session_process.cc1
-rw-r--r--svn_revision.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 0346c75765..7a2fa3cbda 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -417,7 +417,7 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
'ardour.sh.in',
'ardev_common.sh.in',
'ardev', 'ardbg',
- 'ardour2_ui_dark.rc', 'ardour2_ui_light.rc', 'splash.png',
+ 'ardour2_ui_dark.rc.in', 'ardour2_ui_light.rc.in', 'splash.png',
'ardour.menus', 'ardour.bindings.in', 'ardour2_ui_default.conf',
'editor_xpms'
] +
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index ba1ac280be..7413228c42 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -450,6 +450,7 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
_slave->speed_and_position (slave_speed, slave_transport_frame);
if (!_slave->locked()) {
+ cerr << "Slave not locked, not rolling\n";
goto noroll;
}
diff --git a/svn_revision.h b/svn_revision.h
index 4a1eb24c87..42f8329ac1 100644
--- a/svn_revision.h
+++ b/svn_revision.h
@@ -1,4 +1,4 @@
#ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__
-static const char* ardour_svn_revision = "2209";
+static const char* ardour_svn_revision = "2231";
#endif