avoid a set of calls to gettext() and/or cousins from global constructor scope

diff --git a/libs/ardour/ardour/operations.h b/libs/ardour/ardour/operations.h
index d113c621c2cbadf09181f53390296d4c2fdf6f52..531038885085e5bd231f4f36cd52c26558f9207d 100644 (file)
--- a/libs/ardour/ardour/operations.h
+++ b/libs/ardour/ardour/operations.h
@@ -43,5 +43,6 @@ namespace Operations {
        LIBARDOUR_API extern GQuark region_copy;
        LIBARDOUR_API extern GQuark fixed_time_region_copy;
 
+        LIBARDOUR_API void make_operations_quarks ();
 };
 

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index ed62420ff07e7055cb69d7cec3aeb742daee2060..48abda8cfcb8367a18bdfa6962823aff2cad581b 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -89,6 +89,7 @@
 #include "ardour/midi_region.h"
 #include "ardour/midiport_manager.h"
 #include "ardour/mix.h"
+#include "ardour/operations.h"
 #include "ardour/panner_manager.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/process_thread.h"
@@ -246,6 +247,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 
        SessionEvent::init_event_pool ();
 
+       Operations::make_operations_quarks ();
        SessionObject::make_property_quarks ();
        Region::make_property_quarks ();
        MidiRegion::make_property_quarks ();

diff --git a/libs/ardour/operations.cc b/libs/ardour/operations.cc
index 3cdd9368c7d05d09d46a8f5f7d8476ed61a2964a..1b4796d3511ea67fabaaf186c1d9f61afce60377 100644 (file)
--- a/libs/ardour/operations.cc
+++ b/libs/ardour/operations.cc
@@ -21,16 +21,34 @@
 #include "ardour/operations.h"
 #include "i18n.h"
 
-GQuark Operations::capture           = g_quark_from_static_string (_("capture"));
-GQuark Operations::paste             = g_quark_from_static_string (_("paste"));
-GQuark Operations::duplicate_region  = g_quark_from_static_string (_("duplicate region"));
-GQuark Operations::insert_file       = g_quark_from_static_string (_("insert file"));
-GQuark Operations::insert_region     = g_quark_from_static_string (_("insert region"));
-GQuark Operations::drag_region_brush = g_quark_from_static_string (_("drag region brush"));
-GQuark Operations::region_drag       = g_quark_from_static_string (_("region drag"));
-GQuark Operations::selection_grab    = g_quark_from_static_string (_("selection grab"));
-GQuark Operations::region_fill       = g_quark_from_static_string (_("region fill"));
-GQuark Operations::fill_selection    = g_quark_from_static_string (_("fill selection"));
-GQuark Operations::create_region     = g_quark_from_static_string (_("create region"));
-GQuark Operations::region_copy       = g_quark_from_static_string (_("region copy"));
-GQuark Operations::fixed_time_region_copy = g_quark_from_static_string (_("fixed time region copy"));
+GQuark Operations::capture;
+GQuark Operations::paste;
+GQuark Operations::duplicate_region;
+GQuark Operations::insert_file;
+GQuark Operations::insert_region;
+GQuark Operations::drag_region_brush;
+GQuark Operations::region_drag;
+GQuark Operations::selection_grab;
+GQuark Operations::region_fill;
+GQuark Operations::fill_selection;
+GQuark Operations::create_region;
+GQuark Operations::region_copy;
+GQuark Operations::fixed_time_region_copy;
+
+void
+Operations::make_operations_quarks ()
+{
+       Operations::capture           = g_quark_from_static_string (_("capture"));
+       Operations::paste             = g_quark_from_static_string (_("paste"));
+       Operations::duplicate_region  = g_quark_from_static_string (_("duplicate region"));
+       Operations::insert_file       = g_quark_from_static_string (_("insert file"));
+       Operations::insert_region     = g_quark_from_static_string (_("insert region"));
+       Operations::drag_region_brush = g_quark_from_static_string (_("drag region brush"));
+       Operations::region_drag       = g_quark_from_static_string (_("region drag"));
+       Operations::selection_grab    = g_quark_from_static_string (_("selection grab"));
+       Operations::region_fill       = g_quark_from_static_string (_("region fill"));
+       Operations::fill_selection    = g_quark_from_static_string (_("fill selection"));
+       Operations::create_region     = g_quark_from_static_string (_("create region"));
+       Operations::region_copy       = g_quark_from_static_string (_("region copy"));
+       Operations::fixed_time_region_copy = g_quark_from_static_string (_("fixed time region copy"));
+}