Browse Source

tags/2021-05-28
jules 18 years ago
parent
commit
a113da0901
16 changed files with 3746 additions and 3676 deletions
  1. +2
    -0
      build/linux/platform_specific_code/juce_linux_Audio.cpp
  2. +40
    -0
      build/linux/platform_specific_code/juce_linux_Midi.cpp
  3. +2
    -2
      build/linux/platform_specific_code/juce_linux_SystemStats.cpp
  4. +1
    -1
      build/macosx/platform_specific_code/juce_mac_Windowing.cpp
  5. +22
    -2
      build/win32/vc6/JUCE.dsp
  6. +1
    -0
      docs/JUCE changelist.txt
  7. +4
    -2
      extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj
  8. +3644
    -3643
      extras/juce demo/src/BinaryData.cpp
  9. +11
    -11
      extras/juce demo/src/BinaryData.h
  10. +8
    -5
      extras/the jucer/build/mac/Jucer.xcodeproj/project.pbxproj
  11. +1
    -0
      extras/the jucer/src/BinaryData.cpp
  12. +1
    -1
      extras/the jucer/src/jucer_Headers.h
  13. +4
    -4
      juce_Config.h
  14. +0
    -2
      src/juce_appframework/gui/components/controls/juce_TreeView.h
  15. +2
    -0
      src/juce_appframework/gui/components/filebrowser/juce_FileBrowserComponent.h
  16. +3
    -3
      src/juce_core/misc/juce_PlatformUtilities.h

+ 2
- 0
build/linux/platform_specific_code/juce_linux_Audio.cpp View File

@@ -972,6 +972,8 @@ END_JUCE_NAMESPACE
//==============================================================================
#else // if ALSA is turned off..
#include "../../../src/juce_core/basics/juce_StandardHeader.h"
BEGIN_JUCE_NAMESPACE
#include "../../../src/juce_appframework/audio/devices/juce_AudioIODeviceType.h"


+ 40
- 0
build/linux/platform_specific_code/juce_linux_Midi.cpp View File

@@ -443,6 +443,46 @@ MidiInput* MidiInput::createNewDevice (const String& deviceName, MidiInputCallba
END_JUCE_NAMESPACE
//==============================================================================
#else
//==============================================================================
// (These are just stub functions if ALSA is unavailable...)
#include "../../../src/juce_core/basics/juce_StandardHeader.h"
BEGIN_JUCE_NAMESPACE
#include "../../../src/juce_appframework/audio/devices/juce_MidiOutput.h"
#include "../../../src/juce_appframework/audio/devices/juce_MidiInput.h"
//==============================================================================
const StringArray MidiOutput::getDevices() { return StringArray(); }
int MidiOutput::getDefaultDeviceIndex() { return 0; }
MidiOutput* MidiOutput::openDevice (int) { return 0; }
MidiOutput* MidiOutput::createNewDevice (const String&) { return 0; }
MidiOutput::~MidiOutput() {}
void MidiOutput::reset() {}
bool MidiOutput::getVolume (float&, float&) { return false; }
void MidiOutput::setVolume (float, float) {}
void MidiOutput::sendMessageNow (const MidiMessage&) {}
MidiInput::MidiInput (const String& name_)
: name (name_),
internal (0)
{}
MidiInput::~MidiInput() {}
void MidiInput::start() {}
void MidiInput::stop() {}
int MidiInput::getDefaultDeviceIndex() { return 0; }
const StringArray MidiInput::getDevices() { return StringArray(); }
MidiInput* MidiInput::openDevice (int, MidiInputCallback*) { return 0; }
MidiInput* MidiInput::createNewDevice (const String&, MidiInputCallback*) { return 0; }
END_JUCE_NAMESPACE
#endif


+ 2
- 2
build/linux/platform_specific_code/juce_linux_SystemStats.cpp View File

@@ -49,7 +49,7 @@ BEGIN_JUCE_NAMESPACE
//==============================================================================
static juce_noinline unsigned int getCPUIDWord (int* familyModel, int* extFeatures) throw()
/*static juce_noinline unsigned int getCPUIDWord (int* familyModel, int* extFeatures) throw()
{
unsigned int cpu = 0;
unsigned int ext = 0;
@@ -72,7 +72,7 @@ static juce_noinline unsigned int getCPUIDWord (int* familyModel, int* extFeatur
*extFeatures = ext;
return cpu;
}
}*/
//==============================================================================
void Logger::outputDebugString (const String& text) throw()


+ 1
- 1
build/macosx/platform_specific_code/juce_mac_Windowing.cpp View File

@@ -3058,7 +3058,7 @@ static io_object_t getAppleRemoteDevice() throw()
CFMutableDictionaryRef dict = IOServiceMatching ("AppleIRController");
io_iterator_t iter = 0;
io_object_t iod = 0;
io_object_t iod = 0;
if (IOServiceGetMatchingServices (kIOMasterPortDefault, dict, &iter) == kIOReturnSuccess
&& iter != 0)


+ 22
- 2
build/win32/vc6/JUCE.dsp View File

@@ -512,6 +512,10 @@ SOURCE=..\..\..\src\juce_appframework\audio\devices\juce_MidiInput.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\audio\devices\juce_MidiOutput.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\audio\devices\juce_MidiOutput.h
# End Source File
# End Group
@@ -1798,11 +1802,11 @@ SOURCE=..\..\..\src\juce_appframework\gui\components\lookandfeel\juce_LookAndFee
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\lookandfeel\juce_ShinyLookAndFeel.cpp
SOURCE=..\..\..\src\juce_appframework\gui\components\lookandfeel\juce_OldSchoolLookAndFeel.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\lookandfeel\juce_ShinyLookAndFeel.h
SOURCE=..\..\..\src\juce_appframework\gui\components\lookandfeel\juce_OldSchoolLookAndFeel.h
# End Source File
# End Group
# Begin Group "menus"
@@ -2078,6 +2082,14 @@ SOURCE=..\..\..\src\juce_appframework\gui\components\windows\juce_TopLevelWindow
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_DirectoryContentsDisplayComponent.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_DirectoryContentsDisplayComponent.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_DirectoryContentsList.cpp
# End Source File
# Begin Source File
@@ -2142,6 +2154,14 @@ SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_FilePrevie
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_FileTreeComponent.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_FileTreeComponent.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_ImagePreviewComponent.cpp
# End Source File
# Begin Source File


+ 1
- 0
docs/JUCE changelist.txt View File

@@ -9,6 +9,7 @@ Changelist for version 1.44
- added a method Desktop::setScreenSaverEnabled(), which lets you prevent the screen-saver from being activated - handy if your app is doing some kind of presentation. (only implemented on windows/mac - anyone know how to do this on linux?)
- new Mac-only class: AppleRemoteDevice, which lets you grab and listen for events from your Apple remote control. (Only works if you build for 10.3 or above).
- the default Mac build is now 10.3 compatible by default. (If anyone still needs 10.2 ppc compatibility, it still works, you just need to change the settings in the juce.xconfig file)
- tweaks to get it working under Wine.
- change to the keyPressed() and keyStateChanged() callbacks in Component and KeyListener. These used to be void, but they now return a bool to indicate whether the key event was needed or not. Any existing code you've got will break in the compiler, so just change it to return true if the key was used, or false to allow the event to be passed up to the next component in the chain. (This change is a better architecture than before, and was also needed so that plugins can allow unused key events to be passed on to the host application)
- swapped the look and feel classes around, so that the basic LookAndFeel class is now what used to be the "shiny" one. The ShinyLookAndFeel class has been removed, and for that old fashioned look, I've added an OldSchoolLookAndFeel that you can use if you need the original L+F. This means that any custom looks that you were using may need to change their base class.
- changed the MouseEvent structure so that it now contains a pointer to the event component and also the original component.


+ 4
- 2
extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj View File

@@ -322,7 +322,7 @@
);
HEADER_SEARCH_PATHS = "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon";
INFOPLIST_FILE = Info.plist;
LIBRARY_SEARCH_PATHS = ../../../bin;
LIBRARY_SEARCH_PATHS = ../../../../bin;
PRODUCT_NAME = jucedemo;
WRAPPER_EXTENSION = app;
};
@@ -332,6 +332,7 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
"_NDEBUG=1",
@@ -339,7 +340,8 @@
);
HEADER_SEARCH_PATHS = "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon";
INFOPLIST_FILE = Info.plist;
LIBRARY_SEARCH_PATHS = ../../../bin;
LIBRARY_SEARCH_PATHS = ../../../../bin;
ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
PRODUCT_NAME = jucedemo;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;


+ 3644
- 3643
extras/juce demo/src/BinaryData.cpp
File diff suppressed because it is too large
View File


+ 11
- 11
extras/juce demo/src/BinaryData.h View File

@@ -6,7 +6,7 @@
namespace BinaryData
{
extern const char* audiodemo_cpp;
const int audiodemo_cppSize = 23462;
const int audiodemo_cppSize = 23461;
extern const char* cello_wav;
const int cello_wavSize = 46348;
@@ -15,46 +15,46 @@ namespace BinaryData
const int demo_table_data_xmlSize = 5239;
extern const char* draganddropdemo_cpp;
const int draganddropdemo_cppSize = 7874;
const int draganddropdemo_cppSize = 7873;
extern const char* fontsandtextdemo_cpp;
const int fontsandtextdemo_cppSize = 9065;
const int fontsandtextdemo_cppSize = 9064;
extern const char* icons_zip;
const int icons_zipSize = 83876;
extern const char* interprocesscommsdemo_cpp;
const int interprocesscommsdemo_cppSize = 12632;
const int interprocesscommsdemo_cppSize = 12631;
extern const char* juce_png;
const int juce_pngSize = 15290;
extern const char* opengldemo_cpp;
const int opengldemo_cppSize = 8540;
const int opengldemo_cppSize = 8539;
extern const char* pathsandtransformsdemo_cpp;
const int pathsandtransformsdemo_cppSize = 14232;
const int pathsandtransformsdemo_cppSize = 14231;
extern const char* quicktimedemo_cpp;
const int quicktimedemo_cppSize = 4577;
const int quicktimedemo_cppSize = 4576;
extern const char* readme__what_this_directory_is_for_txt;
const int readme__what_this_directory_is_for_txtSize = 259;
extern const char* tabledemo_cpp;
const int tabledemo_cppSize = 12328;
const int tabledemo_cppSize = 12327;
extern const char* threadingdemo_cpp;
const int threadingdemo_cppSize = 10048;
const int threadingdemo_cppSize = 10047;
extern const char* treedemo_xml;
const int treedemo_xmlSize = 1126;
extern const char* treeviewdemo_cpp;
const int treeviewdemo_cppSize = 7535;
const int treeviewdemo_cppSize = 7534;
extern const char* widgetsdemo_cpp;
const int widgetsdemo_cppSize = 52960;
const int widgetsdemo_cppSize = 52957;
};


+ 8
- 5
extras/the jucer/build/mac/Jucer.xcodeproj/project.pbxproj View File

@@ -50,7 +50,7 @@
84F559320A223B0E00A8311C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F5592A0A223B0E00A8311C /* IOKit.framework */; };
84F559330A223B0E00A8311C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F5592B0A223B0E00A8311C /* OpenGL.framework */; };
84F559340A223B0E00A8311C /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F5592C0A223B0E00A8311C /* QuickTime.framework */; };
84FDB1B50C15C24F00CD0087 /* libjuce.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FDB1B20C15C24300CD0087 /* libjuce.a */; };
84FDB1B50C15C24F00CD0087 /* libjucedebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FDB1B20C15C24300CD0087 /* libjucedebug.a */; };
8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; };
/* End PBXBuildFile section */

@@ -189,7 +189,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
84FDB1B50C15C24F00CD0087 /* libjuce.a in Frameworks */,
84FDB1B50C15C24F00CD0087 /* libjucedebug.a in Frameworks */,
84F5592D0A223B0E00A8311C /* AGL.framework in Frameworks */,
84F5592E0A223B0E00A8311C /* Carbon.framework in Frameworks */,
84F5592F0A223B0E00A8311C /* CoreAudio.framework in Frameworks */,
@@ -432,7 +432,7 @@
84FDB1AE0C15C24300CD0087 /* Products */ = {
isa = PBXGroup;
children = (
84FDB1B20C15C24300CD0087 /* libjuce.a */,
84FDB1B20C15C24300CD0087 /* libjucedebug.a */,
);
name = Products;
sourceTree = "<group>";
@@ -480,10 +480,10 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
84FDB1B20C15C24300CD0087 /* libjuce.a */ = {
84FDB1B20C15C24300CD0087 /* libjucedebug.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjuce.a;
path = libjucedebug.a;
remoteRef = 84FDB1B10C15C24300CD0087 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
@@ -575,11 +575,14 @@
C0E91AC708A95435008D54AB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEAD_CODE_STRIPPING = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
PRODUCT_NAME = Jucer;
STRIP_INSTALLED_PRODUCT = YES;
WRAPPER_EXTENSION = app;
};
name = Release;


+ 1
- 0
extras/the jucer/src/BinaryData.cpp View File

@@ -911,3 +911,4 @@ static const unsigned char temp4[] = {137,80,78,71,13,10,26,10,0,0,0,13,73,72,68
0,98,28,9,155,95,0,2,104,68,236,11,1,8,160,17,225,73,128,0,3,0,120,52,172,151,198,78,252,63,0,0,0,0,73,69,78,68,174,66,
96,130,0,0};
const char* BinaryData::prefs_misc_png = (const char*) temp4;

+ 1
- 1
extras/the jucer/src/jucer_Headers.h View File

@@ -47,7 +47,7 @@
//==============================================================================
#define JUCER_MAJOR_VERSION 1
#define JUCER_MINOR_VERSION 10
#define JUCER_MINOR_VERSION 11
//==============================================================================
#include "BinaryData.h"


+ 4
- 4
juce_Config.h View File

@@ -67,13 +67,13 @@
(This only affects a Win32 build)
*/
#ifndef JUCE_ASIO
#define JUCE_ASIO 1
// #define JUCE_ASIO 1
#endif
/** Comment out this macro to disable building of ALSA device support on Linux.
*/
#ifndef JUCE_ALSA
#define JUCE_ALSA 1
// #define JUCE_ALSA 1
#endif
//=============================================================================
@@ -87,7 +87,7 @@
is currently supported.
*/
#if ! (defined (JUCE_QUICKTIME) || defined (LINUX) || (defined (_WIN32) && ! defined (_MSC_VER)))
#define JUCE_QUICKTIME 1
// #define JUCE_QUICKTIME 1
#endif
//=============================================================================
@@ -96,7 +96,7 @@
OpenGLComponent class will be unavailable.
*/
#ifndef JUCE_OPENGL
#define JUCE_OPENGL 1
// #define JUCE_OPENGL 1
#endif
//=============================================================================


+ 0
- 2
src/juce_appframework/gui/components/controls/juce_TreeView.h View File

@@ -521,8 +521,6 @@ public:
include information about where the
tree has been scrolled to vertically,
so this can also be restored
@param alsoIncludeSelectionState if this is true, the selected items will
also be stored in the state that is returned
@see restoreOpennessState
*/
XmlElement* getOpennessState (const bool alsoIncludeScrollPosition) const;


+ 2
- 0
src/juce_appframework/gui/components/filebrowser/juce_FileBrowserComponent.h View File

@@ -91,6 +91,8 @@ public:
show previews of files that the user selects
@param useTreeView if this is false, the files are shown in a list; if true,
they are shown in a treeview
@param filenameTextBoxIsReadOnly if true, the user won't be allowed to type their own
text into the filename box.
*/
FileBrowserComponent (FileChooserMode browserMode,
const File& initialFileOrDirectory,


+ 3
- 3
src/juce_core/misc/juce_PlatformUtilities.h View File

@@ -176,9 +176,9 @@ public:
playButton, /**< The play button. */
plusButton, /**< The plus or volume-up button. */
minusButton, /**< The minus or volume-down button. */
rightButton, /**< The right button (if it's held for a short time). */
leftButton, /**< The left button (if it's held for a short time). */
rightButton_Long, /**< The right button (if it's held for a long time). */
rightButton, /**< The right button (if it's held for a short time). */
leftButton, /**< The left button (if it's held for a short time). */
rightButton_Long, /**< The right button (if it's held for a long time). */
leftButton_Long, /**< The menu button (if it's held for a long time). */
menuButton_Long, /**< The menu button (if it's held for a long time). */
playButtonSleepMode,


Loading…
Cancel
Save