Browse Source

Update cadence tools screenshots, fix build

tags/v0.9.0
falkTX 12 years ago
parent
commit
5e3ae21391
10 changed files with 29 additions and 12 deletions
  1. +17
    -5
      .gitignore
  2. +1
    -1
      c++/carla-includes/carla_osc_includes.h
  3. +8
    -3
      resources/resources.qrc
  4. BIN
      resources/screens/cadence-logs.png
  5. BIN
      resources/screens/cadence-render.png
  6. BIN
      resources/screens/cadence-xycontroller.png
  7. BIN
      resources/screens/logs.png
  8. BIN
      resources/screens/render.png
  9. BIN
      resources/screens/xy-controller.png
  10. +3
    -3
      src/ui/cadence.ui

+ 17
- 5
.gitignore View File

@@ -5,9 +5,9 @@
*~ *~
*.a *.a
*.o *.o
*.so
*.dll *.dll
*.exe *.exe
*.so


*.carxp *.carxp
*.carxs *.carxs
@@ -29,12 +29,24 @@ carla-bridge-vst-x11
carla-discovery-qtcreator carla-discovery-qtcreator
carla-discovery-unix32 carla-discovery-unix32
carla-discovery-unix64 carla-discovery-unix64
carla-discovery-win32.exe
carla-discovery-win32.exe.so
carla-discovery-win64.exe
carla-discovery-win64.exe.so


c++/carla-backend/doxygen/
c++/carla-includes/vst/ c++/carla-includes/vst/
c++/jackmeter/cadence_jackmeter c++/jackmeter/cadence_jackmeter


src/resources_rc.py src/resources_rc.py


# incoming
_/
all-recheck
c++/carla/
c++/carla-backend/carla-dynamic.lv2/
c++/carla-backend/carla_backend_lv2.cpp
c++/carla-backend/carla_backend_vst.cpp
c++/carla-bridge/qt-plugin/
c++/flmixer/
c++/xycontroller/
c++/widgets/ledbutton.*
c++/widgets/pixmapdial.*
c++/widgets/pixmapkeyboard.*

+ 1
- 1
c++/carla-includes/carla_osc_includes.h View File

@@ -150,7 +150,7 @@ void osc_send_midi(const CarlaOscData* const oscData, const uint8_t buf[4])
} }
} }


#if 1//def BUILD_BRIDGE
#ifdef BUILD_BRIDGE
static inline static inline
void osc_send_update(const CarlaOscData* const oscData, const char* const url) void osc_send_update(const CarlaOscData* const oscData, const char* const url)
{ {


+ 8
- 3
resources/resources.qrc View File

@@ -7,6 +7,7 @@
<file>16x16/claudia-launcher.png</file> <file>16x16/claudia-launcher.png</file>
<file>16x16/carla.png</file> <file>16x16/carla.png</file>
<file>16x16/carla-control.png</file> <file>16x16/carla-control.png</file>

<file>16x16/application-exit.png</file> <file>16x16/application-exit.png</file>
<file>16x16/arrow-right.png</file> <file>16x16/arrow-right.png</file>
<file>16x16/configure.png</file> <file>16x16/configure.png</file>
@@ -49,6 +50,7 @@
<file>48x48/claudia-launcher.png</file> <file>48x48/claudia-launcher.png</file>
<file>48x48/carla.png</file> <file>48x48/carla.png</file>
<file>48x48/carla-control.png</file> <file>48x48/carla-control.png</file>

<file>48x48/canvas.png</file> <file>48x48/canvas.png</file>
<file>48x48/exec.png</file> <file>48x48/exec.png</file>
<file>48x48/folder.png</file> <file>48x48/folder.png</file>
@@ -64,6 +66,7 @@
<file>scalable/carla.svg</file> <file>scalable/carla.svg</file>
<file>scalable/carla-control.svg</file> <file>scalable/carla-control.svg</file>
<file>scalable/jack.svg</file> <file>scalable/jack.svg</file>

<file>scalable/pb_generic.svg</file> <file>scalable/pb_generic.svg</file>
<file>scalable/pb_hardware.svg</file> <file>scalable/pb_hardware.svg</file>
<file>scalable/pb_audacious.svg</file> <file>scalable/pb_audacious.svg</file>
@@ -93,8 +96,10 @@
<file>bitmaps/led-big_off.png</file> <file>bitmaps/led-big_off.png</file>
<file>bitmaps/carla_about.png</file> <file>bitmaps/carla_about.png</file>
<file>bitmaps/carla_knobs1.png</file> <file>bitmaps/carla_knobs1.png</file>

<file>bitmaps/canvas/frame_node_header.png</file> <file>bitmaps/canvas/frame_node_header.png</file>
<file>bitmaps/canvas/frame_port_bg.png</file> <file>bitmaps/canvas/frame_port_bg.png</file>

<file>bitmaps/textures/metal_1-512px.jpg</file> <file>bitmaps/textures/metal_1-512px.jpg</file>
<file>bitmaps/textures/metal_2-512px.jpg</file> <file>bitmaps/textures/metal_2-512px.jpg</file>
<file>bitmaps/textures/metal_3-512px.jpg</file> <file>bitmaps/textures/metal_3-512px.jpg</file>
@@ -105,11 +110,11 @@
<file>bitmaps/textures/metal_8-512px.jpg</file> <file>bitmaps/textures/metal_8-512px.jpg</file>
<file>bitmaps/textures/metal_9-512px.jpg</file> <file>bitmaps/textures/metal_9-512px.jpg</file>


<file>screens/cadence-logs.png</file>
<file>screens/cadence-render.png</file>
<file>screens/cadence-xycontroller.png</file>
<file>screens/catia.png</file> <file>screens/catia.png</file>
<file>screens/claudia.png</file> <file>screens/claudia.png</file>
<file>screens/carla.png</file> <file>screens/carla.png</file>
<file>screens/logs.png</file>
<file>screens/render.png</file>
<file>screens/xy-controller.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
resources/screens/cadence-logs.png View File

Before After
Width: 150  |  Height: 119  |  Size: 24KB

BIN
resources/screens/cadence-render.png View File

Before After
Width: 150  |  Height: 110  |  Size: 10KB

BIN
resources/screens/cadence-xycontroller.png View File

Before After
Width: 150  |  Height: 128  |  Size: 9.9KB

BIN
resources/screens/logs.png View File

Before After
Width: 150  |  Height: 106  |  Size: 20KB

BIN
resources/screens/render.png View File

Before After
Width: 150  |  Height: 102  |  Size: 8.2KB

BIN
resources/screens/xy-controller.png View File

Before After
Width: 150  |  Height: 121  |  Size: 8.0KB

+ 3
- 3
src/ui/cadence.ui View File

@@ -681,7 +681,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../../resources/resources.qrc">:/screens/logs.png</pixmap>
<pixmap resource="../../resources/resources.qrc">:/screens/cadence-logs.png</pixmap>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@@ -716,7 +716,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../../resources/resources.qrc">:/screens/render.png</pixmap>
<pixmap resource="../../resources/resources.qrc">:/screens/cadence-render.png</pixmap>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@@ -751,7 +751,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../../resources/resources.qrc">:/screens/xy-controller.png</pixmap>
<pixmap resource="../../resources/resources.qrc">:/screens/cadence-xycontroller.png</pixmap>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>


Loading…
Cancel
Save