Browse Source

Couple of minor fixes.

tags/2021-05-28
Julian Storer 15 years ago
parent
commit
bb60371f1c
5 changed files with 18 additions and 2 deletions
  1. +1
    -1
      src/audio/plugins/formats/juce_VSTPluginFormat.cpp
  2. +1
    -0
      src/gui/components/mouse/juce_DragAndDropContainer.cpp
  3. +2
    -1
      src/gui/components/special/juce_ColourSelector.cpp
  4. +5
    -0
      src/native/windows/juce_win32_AudioCDReader.cpp
  5. +9
    -0
      src/text/juce_String.cpp

+ 1
- 1
src/audio/plugins/formats/juce_VSTPluginFormat.cpp View File

@@ -527,7 +527,7 @@ public:
{
FSRef fn;
if (FSPathMakeRef ((UInt8*) (const char*) filename, &fn, 0) == noErr)
if (FSPathMakeRef ((UInt8*) filename.toUTF8(), &fn, 0) == noErr)
{
resFileId = FSOpenResFile (&fn, fsRdPerm);


+ 1
- 0
src/gui/components/mouse/juce_DragAndDropContainer.cpp View File

@@ -33,6 +33,7 @@ BEGIN_JUCE_NAMESPACE
#include "../../../events/juce_Timer.h"
#include "../../../core/juce_Random.h"
#include "../../graphics/imaging/juce_Image.h"
#include "../mouse/juce_MouseEvent.h"
#include "juce_FileDragAndDropTarget.h"
bool juce_performDragDropFiles (const StringArray& files, const bool copyFiles, bool& shouldStop);


+ 2
- 1
src/gui/components/special/juce_ColourSelector.cpp View File

@@ -28,9 +28,10 @@
BEGIN_JUCE_NAMESPACE
#include "juce_ColourSelector.h"
#include "../../../text/juce_LocalisedStrings.h"
#include "../menus/juce_PopupMenu.h"
#include "../mouse/juce_MouseEvent.h"
#include "../../graphics/imaging/juce_Image.h"
#include "../../../text/juce_LocalisedStrings.h"
static const int swatchesPerRow = 8;
static const int swatchHeight = 22;


+ 5
- 0
src/native/windows/juce_win32_AudioCDReader.cpp View File

@@ -2215,6 +2215,9 @@ public:
private:
Pimpl& pimpl;
ScopedDiscOpener (const ScopedDiscOpener&);
ScopedDiscOpener& operator= (const ScopedDiscOpener&);
};
DiskState getDiskState()
@@ -2391,6 +2394,8 @@ int AudioCDBurner::getNumAvailableAudioBlocks() const
const String AudioCDBurner::burn (AudioCDBurner::BurnProgressListener* listener, bool ejectDiscAfterwards,
bool performFakeBurnForTesting, int writeSpeed)
{
pimpl->setIntProperty (L"WriteSpeed", writeSpeed > 0 ? writeSpeed : -1);
pimpl->listener = listener;
pimpl->progress = 0;
pimpl->shouldCancel = false;


+ 9
- 0
src/text/juce_String.cpp View File

@@ -2158,6 +2158,11 @@ const char* String::toCString() const
}
}
#ifdef _MSC_VER
#pragma warning (disable: 4514 4996)
#pragma warning (push)
#endif
int String::getNumBytesAsCString() const throw()
{
return (int) wcstombs (0, text->text, 0);
@@ -2173,6 +2178,10 @@ int String::copyToCString (char* destBuffer, const int maxBufferSizeBytes) const
return numBytes;
}
#ifdef _MSC_VER
#pragma warning (pop)
#endif
//==============================================================================
void String::copyToUnicode (juce_wchar* const destBuffer, const int maxCharsToCopy) const throw()
{


Loading…
Cancel
Save