fix up formatting of SMPTE time printing in tranzport control code

git-svn-id: svn://localhost/trunk/ardour2@526 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 7 insertions, 10 deletions

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index bd4e93c5dd..4283756a71 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -37,7 +37,6 @@ bool GTK_ARDOUR::use_vst = true;
 bool GTK_ARDOUR::new_session = false;
 char* GTK_ARDOUR::curvetest_file = 0;
 bool GTK_ARDOUR::try_hw_optimization = false;
-bool GTK_ARDOUR::use_gtk_theme = false;
 
 using namespace GTK_ARDOUR;
 
@@ -116,10 +115,6 @@ GTK_ARDOUR::parse_opts (int argc, char *argv[])
 			show_key_actions = true;
 			break;
 
-		case 'g':
-			use_gtk_theme = true;
-			break;
-
 		case 'n':
 			no_splash = false;
 			break;
diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.cc b/libs/surfaces/tranzport/tranzport_control_protocol.cc
index 61c10440ff..4fad413d24 100644
--- a/libs/surfaces/tranzport/tranzport_control_protocol.cc
+++ b/libs/surfaces/tranzport/tranzport_control_protocol.cc
@@ -22,6 +22,8 @@
 #include <algorithm>
 #include <cmath>
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <float.h>
 #include <sys/time.h>
 #include <errno.h>
@@ -327,19 +329,19 @@ TranzportControlProtocol::show_transport_time ()
 		session->smpte_time (where, smpte);
 		
 		if (smpte.negative) {
-			sprintf (buf, "-%02ld:", smpte.hours);
+			sprintf (buf, "-%02" PRIu32 ":", smpte.hours);
 		} else {
-			sprintf (buf, " %02ld:", smpte.hours);
+			sprintf (buf, " %02" PRIu32 ":", smpte.hours);
 		}
 		print (1, 8, buf);
 
-		sprintf (buf, "%02ld:", smpte.minutes);
+		sprintf (buf, "%02" PRIu32 ":", smpte.minutes);
 		print (1, 12, buf);
 
-		sprintf (buf, "%02ld:", smpte.seconds);
+		sprintf (buf, "%02" PRIu32 ":", smpte.seconds);
 		print (1, 15, buf);
 
-		sprintf (buf, "%02ld", smpte.frames);
+		sprintf (buf, "%02" PRIu32, smpte.frames);
 		print (1, 18, buf);
 
 		last_where = where;