merge from 2.0-ongoing by hand, minus key binding editor

[ardour.git] / gtk2_ardour / opts.h

diff --git a/gtk2_ardour/opts.h b/gtk2_ardour/opts.h
index fb780fc8aa3457db18aa2f0ceae6c4724682653f..c1b3f062d407030e12e33b71a400276f9c768456 100644 (file)
--- a/gtk2_ardour/opts.h
+++ b/gtk2_ardour/opts.h
@@ -21,10 +21,11 @@
 #define __ardour_opts_h__
 
 #include <string>
+#include <glibmm/ustring.h>
 
 using std::string;
 
-namespace GTK_ARDOUR {
+namespace ARDOUR_COMMAND_LINE {
 
 extern string session_name;
 extern bool   show_key_actions;
@@ -37,6 +38,7 @@ extern char*  curvetest_file;
 extern bool   try_hw_optimization;
 extern bool   use_gtk_theme;
 extern string keybindings_path;
+extern Glib::ustring menus_file;
 
 extern int32_t parse_opts (int argc, char *argv[]);