Browse Source

Fix juced build

tags/2018-04-16
falkTX 10 years ago
parent
commit
2430bccd1d
10 changed files with 21 additions and 21 deletions
  1. +4
    -4
      libs/juced/source/audio/midi/jucetice_MidiAutomatorManager.cpp
  2. +2
    -2
      libs/juced/source/audio/midi/jucetice_TuningMap.cpp
  3. +2
    -2
      libs/juced/source/controls/coordinate/jucetice_CoordinateSystem.cpp
  4. +4
    -4
      libs/juced/source/controls/coordinate/jucetice_CoordinateSystemRange.cpp
  5. +3
    -3
      libs/juced/source/controls/jucetice_ParameterComboBox.h
  6. +1
    -1
      libs/juced/source/controls/layout/jucetice_Dock.cpp
  7. +1
    -1
      libs/juced/source/database/jucetice_Sqlite.cpp
  8. +1
    -1
      libs/juced/source/network/jucetice_Net.cpp
  9. +2
    -2
      libs/juced/source/scripting/jucetice_ScriptableEngine.cpp
  10. +1
    -1
      libs/juced/source/utils/jucetice_CommandLineTokenizer.cpp

+ 4
- 4
libs/juced/source/audio/midi/jucetice_MidiAutomatorManager.cpp View File

@@ -48,9 +48,9 @@ MidiAutomatable::~MidiAutomatable()

void MidiAutomatable::activateLearning ()
{
jassert (midiAutomatorManager != 0) // if you fallback here then you don't have registered your
// midi automatable object to the manager before actually starting
// the midi learn feature
jassert (midiAutomatorManager != 0); // if you fallback here then you don't have registered your
// midi automatable object to the manager before actually starting
// the midi learn feature

if (midiAutomatorManager)
midiAutomatorManager->setActiveLearner (this);
@@ -201,7 +201,7 @@ void MidiAutomatorManager::removeMidiAutomatable (MidiAutomatable* object)
//==============================================================================
void MidiAutomatorManager::clearMidiAutomatableFromCC (const int ccNumber)
{
jassert (ccNumber >= 0 && ccNumber < 128)
jassert (ccNumber >= 0 && ccNumber < 128);

Array<void*>* array = controllers.getUnchecked (ccNumber);


+ 2
- 2
libs/juced/source/audio/midi/jucetice_TuningMap.cpp View File

@@ -298,7 +298,7 @@ bool TuningMap::readFromStream (InputStream& ifs)
//==============================================================================
bool TuningMap::setBaseFreq (double dblBaseFreq)
{
// jassert( dblBaseFreq > 0 )
// jassert( dblBaseFreq > 0 );
// First make sure, that the base frequency is in the valid range
if ( dblBaseFreq > 0 )
@@ -314,7 +314,7 @@ bool TuningMap::setBaseFreq (double dblBaseFreq)
bool TuningMap::setRelativeTune (int nNoteIndex, double dblTune)
{
// jassert( (nNoteIndex >= 0) && (nNoteIndex <= 127) )
// jassert( (nNoteIndex >= 0) && (nNoteIndex <= 127) );
// First make sure, that the note index is in the valid range
if ( (nNoteIndex >= 0) && (nNoteIndex <= 127) )


+ 2
- 2
libs/juced/source/controls/coordinate/jucetice_CoordinateSystem.cpp View File

@@ -1676,7 +1676,7 @@ void CoordinateSystem::updateScaleFactors()
// scaling factor for linear plots
else
{
jassert( ((range.getMaxX()/range.getMinX()) > 0.0) )
jassert( ((range.getMaxX()/range.getMinX()) > 0.0) );
// caught a logarithm of a non-positive number, make sure that the
// minimum and the maximum for the x-coordinate are both strictly positive
// for logarithmic axis-scaling
@@ -1693,7 +1693,7 @@ void CoordinateSystem::updateScaleFactors()
scaleY = getHeight() / (range.getMaxY()-range.getMinY());
else
{
jassert( ((range.getMaxY()/range.getMinY()) > 0.0) )
jassert( ((range.getMaxY()/range.getMinY()) > 0.0) );
// caught a logarithm of a non-positive number, make sure that the
// minimum and the maximum for the y-coordinate are both strictly positive
// for logarithmic axis-scaling


+ 4
- 4
libs/juced/source/controls/coordinate/jucetice_CoordinateSystemRange.cpp View File

@@ -47,28 +47,28 @@ CoordinateSystemRange::~CoordinateSystemRange()
void CoordinateSystemRange::setMinX(double newMinX)
{
jassert( newMinX < maxX )
jassert( newMinX < maxX );
if( newMinX < maxX )
minX = newMinX;
}
void CoordinateSystemRange::setMaxX(double newMaxX)
{
jassert( newMaxX > minX )
jassert( newMaxX > minX );
if( newMaxX > minX )
maxX = newMaxX;
}
void CoordinateSystemRange::setMinY(double newMinY)
{
jassert( newMinY < maxY )
jassert( newMinY < maxY );
if( newMinY < maxY )
minY = newMinY;
}
void CoordinateSystemRange::setMaxY(double newMaxY)
{
jassert( newMaxY > minY )
jassert( newMaxY > minY );
if( newMaxY > minY )
maxY = newMaxY;
}


+ 3
- 3
libs/juced/source/controls/jucetice_ParameterComboBox.h View File

@@ -59,9 +59,9 @@ public:
// DBG (String (parameter->getName ()) + " " + String (newItemSelected));
jassert (newItemSelected > 0) // if you fall back here, then you have defined
// a parameter which starts from 0 and not from
// 1 and this is impossible in a ComboBox
jassert (newItemSelected > 0); // if you fall back here, then you have defined
// a parameter which starts from 0 and not from
// 1 and this is impossible in a ComboBox
setSelectedId (newItemSelected, sendNotification);
#else


+ 1
- 1
libs/juced/source/controls/layout/jucetice_Dock.cpp View File

@@ -66,7 +66,7 @@ void Dockable::continueDocking (const MouseEvent& e)
{
// to be able to do a drag-and-drop operation, the component needs to
// be inside a component which is also a DragAndDropContainer.
jassertfalse
jassertfalse;
}
}
}


+ 1
- 1
libs/juced/source/database/jucetice_Sqlite.cpp View File

@@ -182,7 +182,7 @@ SqliteResultset* SqliteConnection::executeQuery (const String& sqlText)

const StringPairArray SqliteConnection::getTableSchema (const String& tableName)
{
jassertfalse // not implemented !
jassertfalse; // not implemented !
StringPairArray schema;



+ 1
- 1
libs/juced/source/network/jucetice_Net.cpp View File

@@ -694,7 +694,7 @@ namespace NetWrapperFunctions
break;
}
jassertfalse // should never reach here !
jassertfalse; // should never reach here !
return CURLOPT_FILE;
}


+ 2
- 2
libs/juced/source/scripting/jucetice_ScriptableEngine.cpp View File

@@ -872,7 +872,7 @@ String ScriptableEngine::serializeVariable (asIScriptContext* context, const int
//==============================================================================
void ScriptableEngine::addResolveFilePath (const File& directoryToLookInto)
{
jassert (!directoryToLookInto.exists())
jassert (!directoryToLookInto.exists());

if (directoryToLookInto.existsAsFile())
resolvePaths.add (directoryToLookInto.getParentDirectory().getFullPathName());
@@ -882,7 +882,7 @@ void ScriptableEngine::addResolveFilePath (const File& directoryToLookInto)

void ScriptableEngine::removeResolveFilePath (const File& directoryToLookInto)
{
jassert (! directoryToLookInto.exists())
jassert (! directoryToLookInto.exists());

if (directoryToLookInto.existsAsFile())
resolvePaths.removeString (directoryToLookInto.getParentDirectory().getFullPathName());


+ 1
- 1
libs/juced/source/utils/jucetice_CommandLineTokenizer.cpp View File

@@ -51,7 +51,7 @@ void CommandLineTokenizer::parseCommandLine (const String& commandLine)
//==============================================================================
const String& CommandLineTokenizer::operator[] (const int index) const throw()
{
jassert (index >= 0 && index < argv.size())
jassert (index >= 0 && index < argv.size());
return argv[index];
}


Loading…
Cancel
Save