falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 43 Activity
Browse Source

Dont use the new code for now

tags/1.9.4
falkTX 11 years ago
parent
d50ba0e0e0
commit
9ea863f7d8
3 changed files with 9 additions and 7 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -0
      source/tests/CarlaUtils4.cpp
  2. +5
    -5
      source/utils/CarlaStateUtils.cpp
  3. +2
    -2
      source/utils/CarlaStateUtils.hpp

+ 2
- 0
source/tests/CarlaUtils4.cpp View File

@@ -26,6 +26,7 @@ using namespace CarlaBackend;
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------


#define HAVE_JUCE #define HAVE_JUCE
#define HAVE_JUCE_LATER
#undef CARLA_BACKEND_START_NAMESPACE #undef CARLA_BACKEND_START_NAMESPACE
#define CARLA_BACKEND_START_NAMESPACE namespace state_juce { #define CARLA_BACKEND_START_NAMESPACE namespace state_juce {
#include "CarlaStateUtils.cpp" #include "CarlaStateUtils.cpp"
@@ -37,6 +38,7 @@ using namespace CarlaBackend;
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------


#undef HAVE_JUCE #undef HAVE_JUCE
#undef HAVE_JUCE_LATER
#undef CARLA_BACKEND_START_NAMESPACE #undef CARLA_BACKEND_START_NAMESPACE
#define CARLA_BACKEND_START_NAMESPACE namespace state_qt { #define CARLA_BACKEND_START_NAMESPACE namespace state_qt {
#include "CarlaStateUtils.cpp" #include "CarlaStateUtils.cpp"


+ 5
- 5
source/utils/CarlaStateUtils.cpp View File

@@ -21,7 +21,7 @@
#include "CarlaMathUtils.hpp" #include "CarlaMathUtils.hpp"
#include "CarlaMIDI.h" #include "CarlaMIDI.h"


#ifdef HAVE_JUCE
#ifdef HAVE_JUCE_LATER
# include "juce_core.h" # include "juce_core.h"
using juce::String; using juce::String;
using juce::XmlElement; using juce::XmlElement;
@@ -176,7 +176,7 @@ void SaveState::reset() noexcept
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// xmlSafeString // xmlSafeString


#ifdef HAVE_JUCE
#ifdef HAVE_JUCE_LATER
static String xmlSafeString(const String& string, const bool toXml) static String xmlSafeString(const String& string, const bool toXml)
{ {
String newString(string); String newString(string);
@@ -201,7 +201,7 @@ static QString xmlSafeString(const QString& string, const bool toXml)
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// xmlSafeStringCharDup // xmlSafeStringCharDup


#ifdef HAVE_JUCE
#ifdef HAVE_JUCE_LATER
static const char* xmlSafeStringCharDup(const String& string, const bool toXml) static const char* xmlSafeStringCharDup(const String& string, const bool toXml)
{ {
return carla_strdup(xmlSafeString(string, toXml).toRawUTF8()); return carla_strdup(xmlSafeString(string, toXml).toRawUTF8());
@@ -216,7 +216,7 @@ static const char* xmlSafeStringCharDup(const QString& string, const bool toXml)
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// fillSaveStateFromXmlNode // fillSaveStateFromXmlNode


#ifdef HAVE_JUCE
#ifdef HAVE_JUCE_LATER
void fillSaveStateFromXmlNode(SaveState& saveState, const XmlElement* const xmlElement) void fillSaveStateFromXmlNode(SaveState& saveState, const XmlElement* const xmlElement)
{ {
CARLA_SAFE_ASSERT_RETURN(xmlElement != nullptr,); CARLA_SAFE_ASSERT_RETURN(xmlElement != nullptr,);
@@ -625,7 +625,7 @@ void fillSaveStateFromXmlNode(SaveState& saveState, const QDomNode& xmlNode)
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// fillXmlStringFromSaveState // fillXmlStringFromSaveState


#ifdef HAVE_JUCE
#ifdef HAVE_JUCE_LATER
void fillXmlStringFromSaveState(String& content, const SaveState& saveState) void fillXmlStringFromSaveState(String& content, const SaveState& saveState)
{ {
{ {


+ 2
- 2
source/utils/CarlaStateUtils.hpp View File

@@ -21,7 +21,7 @@
#include "CarlaBackend.h" #include "CarlaBackend.h"
#include "LinkedList.hpp" #include "LinkedList.hpp"


#ifdef HAVE_JUCE
#ifdef HAVE_JUCE_LATER
namespace juce { namespace juce {
class String; class String;
class XmlElement; class XmlElement;
@@ -106,7 +106,7 @@ struct SaveState {


// ----------------------------------------------------------------------- // -----------------------------------------------------------------------


#ifdef HAVE_JUCE
#ifdef HAVE_JUCE_LATER
void fillSaveStateFromXmlNode(SaveState& saveState, const juce::XmlElement* const xmlElement); void fillSaveStateFromXmlNode(SaveState& saveState, const juce::XmlElement* const xmlElement);
void fillXmlStringFromSaveState(juce::String& content, const SaveState& saveState); void fillXmlStringFromSaveState(juce::String& content, const SaveState& saveState);
#else #else


Write Preview
Loading…
Cancel
Save