Apply patch from mantis 2761 from tinram to add padding and make a string translatable.

[ardour.git] / gtk2_ardour / opts.h

diff --git a/gtk2_ardour/opts.h b/gtk2_ardour/opts.h
index fb780fc8aa3457db18aa2f0ceae6c4724682653f..71cd687b8bbe460d150dee23b5d24058cda448ca 100644 (file)
--- a/gtk2_ardour/opts.h
+++ b/gtk2_ardour/opts.h
@@ -21,22 +21,23 @@
 #define __ardour_opts_h__
 
 #include <string>
+#include <glibmm/ustring.h>
 
-using std::string;
+namespace ARDOUR_COMMAND_LINE {
 
-namespace GTK_ARDOUR {
-
-extern string session_name;
+extern std::string session_name;
 extern bool   show_key_actions;
 extern bool   no_splash;
 extern bool   just_version;
-extern string jack_client_name;
+extern std::string jack_client_name;
 extern bool   use_vst;
 extern bool   new_session;
 extern char*  curvetest_file;
 extern bool   try_hw_optimization;
 extern bool   use_gtk_theme;
-extern string keybindings_path;
+extern std::string keybindings_path;
+extern Glib::ustring menus_file;
+extern bool   finder_invoked_ardour;
 
 extern int32_t parse_opts (int argc, char *argv[]);