zynaddsubfx

commit 13555f3e87fa9bdab003ee424e5b9c1d73e80f5c
parent 2032e6b8b83eb743f32ab25ba4c8d943332cfd70
Author: falkTX <falktx@gmail.com>
Date:   Thu, 14 May 2015 19:36:51 +0200

Fix carla paths

Diffstat:
M
src/UI/Connection.cpp
 | 
4
++--
M
src/UI/VirKeyboard.fl
 | 
8
++++----
M
src/UI/guimain.cpp
 | 
6
+++---

3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/UI/Connection.cpp b/src/UI/Connection.cpp
@@ -83,7 +83,7 @@ ui_handle_t GUI::createUi(Fl_Osc_Interface *osc, void *exit)
 
 
 #ifdef CARLA_VERSION_STRING
-    if(Fl_Shared_Image *img = Fl_Shared_Image::get(gUiPixmapPath + "window_backdrop.png"))
+    if(Fl_Shared_Image *img = Fl_Shared_Image::get(gUiPixmapPath + "/window_backdrop.png"))
         Fl::scheme_bg(new Fl_Tiled_Image(img));
 #else
     if(Fl_Shared_Image *img = Fl_Shared_Image::get(PIXMAP_PATH "/window_backdrop.png"))
@@ -95,7 +95,7 @@ ui_handle_t GUI::createUi(Fl_Osc_Interface *osc, void *exit)
         errx(1, "ERROR: Cannot find pixmaps/window_backdrop.png");
 
 #ifdef CARLA_VERSION_STRING
-    if(Fl_Shared_Image *img = Fl_Shared_Image::get(gUiPixmapPath + "module_backdrop.png"))
+    if(Fl_Shared_Image *img = Fl_Shared_Image::get(gUiPixmapPath + "/module_backdrop.png"))
         module_backdrop = new Fl_Tiled_Image(img);
 #else
     if(Fl_Shared_Image *img = Fl_Shared_Image::get(PIXMAP_PATH "/module_backdrop.png"))
diff --git a/src/UI/VirKeyboard.fl b/src/UI/VirKeyboard.fl
@@ -102,10 +102,10 @@ rndvelocity=0;} {selected
 
 \#ifdef NTK_GUI
 \#ifdef CARLA_VERSION_STRING
- Fl_Image *white_up = Fl_Shared_Image::get( gUiPixmapPath + "white_key.png" );
- Fl_Image *white_down = Fl_Shared_Image::get( gUiPixmapPath + "white_key_pressed.png" );
- Fl_Image *black_up = Fl_Shared_Image::get( gUiPixmapPath + "black_key.png" );
- Fl_Image *black_down = Fl_Shared_Image::get( gUiPixmapPath + "black_key_pressed.png" );
+ Fl_Image *white_up = Fl_Shared_Image::get( gUiPixmapPath + "/white_key.png" );
+ Fl_Image *white_down = Fl_Shared_Image::get( gUiPixmapPath + "/white_key_pressed.png" );
+ Fl_Image *black_up = Fl_Shared_Image::get( gUiPixmapPath + "/black_key.png" );
+ Fl_Image *black_down = Fl_Shared_Image::get( gUiPixmapPath + "/black_key_pressed.png" );
 \#else
  Fl_Image *white_up = Fl_Shared_Image::get( PIXMAP_PATH "white_key.png" );
  Fl_Image *white_down = Fl_Shared_Image::get( PIXMAP_PATH "white_key_pressed.png" );
diff --git a/src/UI/guimain.cpp b/src/UI/guimain.cpp
@@ -126,7 +126,7 @@ ui_handle_t GUI::createUi(Fl_Osc_Interface *osc, void *exit)
     Fl_Dial::default_style(Fl_Dial::PIXMAP_DIAL);
 
 #ifdef CARLA_VERSION_STRING
-    if(Fl_Shared_Image *img = Fl_Shared_Image::get(gUiPixmapPath + "knob.png"))
+    if(Fl_Shared_Image *img = Fl_Shared_Image::get(gUiPixmapPath + "/knob.png"))
         Fl_Dial::default_image(img);
 #else
     if(Fl_Shared_Image *img = Fl_Shared_Image::get(PIXMAP_PATH "/knob.png"))
@@ -139,7 +139,7 @@ ui_handle_t GUI::createUi(Fl_Osc_Interface *osc, void *exit)
 
 
 #ifdef CARLA_VERSION_STRING
-    if(Fl_Shared_Image *img = Fl_Shared_Image::get(gUiPixmapPath + "window_backdrop.png"))
+    if(Fl_Shared_Image *img = Fl_Shared_Image::get(gUiPixmapPath + "/window_backdrop.png"))
         Fl::scheme_bg(new Fl_Tiled_Image(img));
 #else
     if(Fl_Shared_Image *img = Fl_Shared_Image::get(PIXMAP_PATH "/window_backdrop.png"))
@@ -151,7 +151,7 @@ ui_handle_t GUI::createUi(Fl_Osc_Interface *osc, void *exit)
         errx(1, "ERROR: Cannot find pixmaps/window_backdrop.png");
 
 #ifdef CARLA_VERSION_STRING
-    if(Fl_Shared_Image *img = Fl_Shared_Image::get(gUiPixmapPath + "module_backdrop.png"))
+    if(Fl_Shared_Image *img = Fl_Shared_Image::get(gUiPixmapPath + "/module_backdrop.png"))
         module_backdrop = new Fl_Tiled_Image(img);
 #else
     if(Fl_Shared_Image *img = Fl_Shared_Image::get(PIXMAP_PATH "/module_backdrop.png"))