Browse Source

More typechecking and misc fixes

tags/1.9.4
falkTX 12 years ago
parent
commit
43bc5a14ea
4 changed files with 158 additions and 232 deletions
  1. +2
    -8
      source/backend/CarlaEngine.hpp
  2. +153
    -220
      source/backend/engine/CarlaEngine.cpp
  3. +2
    -2
      source/backend/engine/CarlaEngineThread.cpp
  4. +1
    -2
      source/tests/ANSI.cpp

+ 2
- 8
source/backend/CarlaEngine.hpp View File

@@ -1005,7 +1005,6 @@ private:

public:
#ifdef BUILD_BRIDGE
void osc_send_peaks(CarlaPlugin* const plugin);
void osc_send_bridge_audio_count(const int32_t ins, const int32_t outs, const int32_t total);
void osc_send_bridge_midi_count(const int32_t ins, const int32_t outs, const int32_t total);
void osc_send_bridge_parameter_count(const int32_t ins, const int32_t outs, const int32_t total);
@@ -1024,10 +1023,8 @@ public:
void osc_send_bridge_set_midi_program(const int32_t index);
void osc_send_bridge_set_custom_data(const char* const type, const char* const key, const char* const value);
void osc_send_bridge_set_chunk_data(const char* const chunkFile);
void osc_send_bridge_set_inpeak(const int32_t portId);
void osc_send_bridge_set_outpeak(const int32_t portId);
void osc_send_bridge_set_peaks();
#else
void osc_send_peaks(CarlaPlugin* const plugin, const unsigned int id);
void osc_send_control_add_plugin_start(const int32_t pluginId, const char* const pluginName);
void osc_send_control_add_plugin_end(const int32_t pluginId);
void osc_send_control_remove_plugin(const int32_t pluginId);
@@ -1047,10 +1044,7 @@ public:
void osc_send_control_set_midi_program_data(const int32_t pluginId, const int32_t index, const int32_t bank, const int32_t program, const char* const name);
void osc_send_control_note_on(const int32_t pluginId, const int32_t channel, const int32_t note, const int32_t velo);
void osc_send_control_note_off(const int32_t pluginId, const int32_t channel, const int32_t note);
// FIXME, join
void osc_send_control_set_input_peak_value(const int32_t pluginId, const int32_t portId);
// FIXME, join
void osc_send_control_set_output_peak_value(const int32_t pluginId, const int32_t portId);
void osc_send_control_set_peaks(const int32_t pluginId);
void osc_send_control_exit();
#endif



+ 153
- 220
source/backend/engine/CarlaEngine.cpp
File diff suppressed because it is too large
View File


+ 2
- 2
source/backend/engine/CarlaEngineThread.cpp View File

@@ -135,9 +135,9 @@ void CarlaEngineThread::run()
if (oscRegisted)
{
#ifdef BUILD_BRIDGE
kEngine->osc_send_peaks(plugin);
kEngine->osc_send_bridge_set_peaks();
#else
kEngine->osc_send_peaks(plugin, i);
kEngine->osc_send_control_set_peaks(i);
#endif
}
}


+ 1
- 2
source/tests/ANSI.cpp View File

@@ -16,7 +16,7 @@
*/

// still need qt classes check
#include "engine/CarlaEngine.cpp"
#include "engine/CarlaEngineThread.cpp"

#if 0
#include "CarlaDefines.hpp"
@@ -51,6 +51,5 @@

int main()
{
CarlaBackend::CarlaEngineProtectedData x(nullptr);
return 0;
}

Loading…
Cancel
Save