additional DEBUG_TRACE output for slave/diskreader

[ardour.git] / gtk2_ardour / utils.cc

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 26b048f2b0ad2515204b30b557ba4db71cc86925..97c36b7fafabec11705845ca50bc4e55afd85eab 100644 (file)
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -28,25 +28,28 @@
 #include <cmath>
 #include <list>
 #include <sys/stat.h>
-#include <gtkmm/rc.h>
-#include <gtkmm/window.h>
+
+#include <boost/algorithm/string.hpp>
+
+#include <gtk/gtkpaned.h>
 #include <gtkmm/combo.h>
 #include <gtkmm/label.h>
 #include <gtkmm/paned.h>
-#include <gtk/gtkpaned.h>
-#include <boost/algorithm/string.hpp>
+#include <gtkmm/rc.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/window.h>
 
 #include "pbd/basename.h"
 #include "pbd/file_utils.h"
 #include "pbd/stacktrace.h"
 
-#include <gtkmm2ext/utils.h>
-
 #include "ardour/filesystem_paths.h"
 #include "ardour/search_paths.h"
 
+#include "gtkmm2ext/colors.h"
+#include "gtkmm2ext/utils.h"
+
 #include "canvas/item.h"
-#include "canvas/utils.h"
 
 #include "debug.h"
 #include "public_editor.h"
@@ -276,7 +279,7 @@ Gdk::Color
 ARDOUR_UI_UTILS::gdk_color_from_rgba (uint32_t rgba)
 {
        Gdk::Color c;
-       set_color_from_rgb (c, rgba);
+       set_color_from_rgb (c, rgba >> 8);
        return c;
 }
 
@@ -403,7 +406,12 @@ ARDOUR_UI_UTILS::get_color_themes (map<std::string,std::string>& themes)
                                continue;
                        }
 
-                       themes.insert (make_pair (prop->value(), Glib::filename_to_utf8 (basename_nosuffix(*e))));
+                       std::string color_name = basename_nosuffix(*e);
+                       size_t sep = color_name.find_first_of("-");
+                       if (sep != string::npos) {
+                               color_name = color_name.substr (0, sep);
+                       }
+                       themes.insert (make_pair (prop->value(), color_name));
                }
        }
 }