Skip to content

Commit 4f1dca2

Browse files
aacuevasaacuevas
committed
Merge pull request #286 from cstawarz/master
Fix some bugs, remove many compiler warnings
2 parents f9e7ccb + 4c079b4 commit 4f1dca2

41 files changed

Lines changed: 130 additions & 106 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Builds/Linux/build/windowState.xml
2828
Builds/Linux/build/Data
2929
Builds/Linux/build/*.xml
3030
Builds/Linux/build/*.out
31-
Builds/MacOSX/build
3231

3332
# 4. Windows related
3433
Builds/VisualStudio2012/Debug
@@ -91,3 +90,9 @@ Builds/MacOSX/open-ephys.xcodeproj/*.mode1v3
9190
Builds/MacOSX/open-ephys.xcodeproj/*.pbxuser
9291
Builds/MacOSX/open-ephys.xcodeproj/xcuserdata
9392
Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace
93+
Builds/MacOSX/build
94+
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/*.mode1v3
95+
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/*.pbxuser
96+
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/xcuserdata
97+
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.xcworkspace
98+
Introjucer/Builds/MacOSX/build

‎Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
E100912B2FCE36A30D097C95 = {isa = PBXBuildFile; fileRef = 9C21DBFB38865E5AFE367C6F; };
1818
CAB9D9DEF279F93132B45F90 = {isa = PBXBuildFile; fileRef = 80C1B737D2C2CB519D1787D7; };
1919
CA4DCF67B48352BE633A616D = {isa = PBXBuildFile; fileRef = C055D09224D84121A3EBB29F; };
20-
FD4865450F4C47FF3C6327FE = {isa = PBXBuildFile; fileRef = 56169D835A3E3029D6E3904C; };
2120
512D7D16D0A95BDD0D6D6E45 = {isa = PBXBuildFile; fileRef = 4FD13AA663EEE7CC2F83033D; };
2221
2D2BDB63CBD0BED07FF9E44B = {isa = PBXBuildFile; fileRef = BBE1DB78E35135B41537DCB5; };
2322
4FA2949D3023FC2E377AFFB6 = {isa = PBXBuildFile; fileRef = 61317B5191E05925F232E18C; };
@@ -542,7 +541,6 @@
542541
55EBFCA56B915C8CD043365C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectWriteTypeLayout.cpp"; path = "../../JuceLibraryCode/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp"; sourceTree = "SOURCE_ROOT"; };
543542
55F7467B96E236DD558228C9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharPointer_UTF8.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_CharPointer_UTF8.h"; sourceTree = "SOURCE_ROOT"; };
544543
560A28C1966B1817873CF764 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiMessageSequence.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp"; sourceTree = "SOURCE_ROOT"; };
545-
56169D835A3E3029D6E3904C = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
546544
56242BB33B53F133914517BD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RecordControlEditor.cpp; path = ../../Source/Processors/RecordControl/RecordControlEditor.cpp; sourceTree = "SOURCE_ROOT"; };
547545
562E4A50364EEDC3AA2AACB8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeTime.h"; path = "../../JuceLibraryCode/modules/juce_core/time/juce_RelativeTime.h"; sourceTree = "SOURCE_ROOT"; };
548546
563F35B171FAF2540923CE45 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioDataConverters.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1253,23 +1251,24 @@
12531251
E7ACE8C1456403A574236451 = {isa = PBXFileReference; lastKnownFileType = file; name = "cpmono-bold-serialized"; path = "../../Resources/Fonts/cpmono-bold-serialized"; sourceTree = "SOURCE_ROOT"; };
12541252
E7EE416EF527C7506B499070 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BigInteger.h"; path = "../../JuceLibraryCode/modules/juce_core/maths/juce_BigInteger.h"; sourceTree = "SOURCE_ROOT"; };
12551253
E835BEB3C42E4B241804BE13 = {isa = PBXFileReference; lastKnownFileType = file; name = "cpmono-light-serialized"; path = "../../Resources/Fonts/cpmono-light-serialized"; sourceTree = "SOURCE_ROOT"; };
1254+
E849E3966302E7D4D06712F5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RecordControl.cpp; path = ../../Source/Processors/RecordControl/RecordControl.cpp; sourceTree = "SOURCE_ROOT"; };
12561255
E850C14F13F9855CE1E14C1A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ArduinoOutputEditor.cpp; path = ../../Source/Processors/ArduinoOutput/ArduinoOutputEditor.cpp; sourceTree = "SOURCE_ROOT"; };
12571256
E8964C0BE264A55753BC6B7B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Midi.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_devices/native/juce_linux_Midi.cpp"; sourceTree = "SOURCE_ROOT"; };
1258-
E8D51D470C9955D7D03D5469 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ChebyshevII.h; path = ../../Source/Processors/Dsp/ChebyshevII.h; sourceTree = "SOURCE_ROOT"; };
12591257
E91923510CB2280C3A3B9E9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LocalisedStrings.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_LocalisedStrings.h"; sourceTree = "SOURCE_ROOT"; };
1260-
E91A272EF06892937CB4B9CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentDragger.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp"; sourceTree = "SOURCE_ROOT"; };
1261-
EA2FC92CECD1EDA1F07DC59C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TooltipWindow.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_TooltipWindow.h"; sourceTree = "SOURCE_ROOT"; };
1258+
E946426F95E0240683CB3337 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawablePath.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_DrawablePath.h"; sourceTree = "SOURCE_ROOT"; };
12621259
EA354D7D8E48D461415D52D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../JuceLibraryCode/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
12631260
EA9518CDEA7049C21D5CE2D5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Process.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_Process.h"; sourceTree = "SOURCE_ROOT"; };
12641261
EAB6A66678B122C578B16445 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HighResolutionTimer.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.h"; sourceTree = "SOURCE_ROOT"; };
12651262
EAC262A83CD2BEA14542AE89 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPool.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPool.h"; sourceTree = "SOURCE_ROOT"; };
1263+
EDA209B0E7D124EA581023AD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioFormatManager.h"; path = "../../JuceLibraryCode/modules/juce_audio_formats/format/juce_AudioFormatManager.h"; sourceTree = "SOURCE_ROOT"; };
12661264
EF3F9AA8D70E1D4D55F13182 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; };
12671265
F5A00ACFA3D76168F22F1205 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
12681266
99E1BC08B886CFDD2CCFD462 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "open-ephys.app"; sourceTree = "BUILT_PRODUCTS_DIR"; };
1269-
E849E3966302E7D4D06712F5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RecordControl.cpp; path = ../../Source/Processors/RecordControl/RecordControl.cpp; sourceTree = "SOURCE_ROOT"; };
1267+
E8D51D470C9955D7D03D5469 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ChebyshevII.h; path = ../../Source/Processors/Dsp/ChebyshevII.h; sourceTree = "SOURCE_ROOT"; };
1268+
E91A272EF06892937CB4B9CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentDragger.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp"; sourceTree = "SOURCE_ROOT"; };
12701269
E93BE115650B1CB80EACB841 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EditorViewportButtons.h; path = ../../Source/UI/EditorViewportButtons.h; sourceTree = "SOURCE_ROOT"; };
1271-
E946426F95E0240683CB3337 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawablePath.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_DrawablePath.h"; sourceTree = "SOURCE_ROOT"; };
12721270
E97684DCE824DEDA6683C6CD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Synthesiser.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp"; sourceTree = "SOURCE_ROOT"; };
1271+
EA2FC92CECD1EDA1F07DC59C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TooltipWindow.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_TooltipWindow.h"; sourceTree = "SOURCE_ROOT"; };
12731272
EA73332E3D5AEC04ADDFBB2A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDataConverters.h"; path = "../../JuceLibraryCode/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h"; sourceTree = "SOURCE_ROOT"; };
12741273
EAB2319C7AA57E06A2247CDF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BorderSize.h"; path = "../../JuceLibraryCode/modules/juce_graphics/geometry/juce_BorderSize.h"; sourceTree = "SOURCE_ROOT"; };
12751274
EAB637B566FEBBDADA654262 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VSTMidiEventList.h"; path = "../../JuceLibraryCode/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1284,7 +1283,6 @@
12841283
ECE3BE71EB6B9CF1CE869BBE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BubbleComponent.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/misc/juce_BubbleComponent.h"; sourceTree = "SOURCE_ROOT"; };
12851284
ED86166920362E9D2BE2CB26 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SVGParser.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_SVGParser.cpp"; sourceTree = "SOURCE_ROOT"; };
12861285
ED887A521EEB8F3EBA7DDB31 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioIODeviceType.h"; path = "../../JuceLibraryCode/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h"; sourceTree = "SOURCE_ROOT"; };
1287-
EDA209B0E7D124EA581023AD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioFormatManager.h"; path = "../../JuceLibraryCode/modules/juce_audio_formats/format/juce_AudioFormatManager.h"; sourceTree = "SOURCE_ROOT"; };
12881286
EDAC82BD742A54182E8DF2FE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeCoordinatePositioner.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.h"; sourceTree = "SOURCE_ROOT"; };
12891287
EE0336B43A39FD585DF638EE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ResizableEdgeComponent.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
12901288
EE2C669B127D00C86B1B8CA8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Registry.cpp"; path = "../../JuceLibraryCode/modules/juce_core/native/juce_win32_Registry.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -2860,7 +2858,6 @@
28602858
9C21DBFB38865E5AFE367C6F,
28612859
80C1B737D2C2CB519D1787D7,
28622860
C055D09224D84121A3EBB29F,
2863-
56169D835A3E3029D6E3904C,
28642861
4FD13AA663EEE7CC2F83033D, ); name = Frameworks; sourceTree = "<group>"; };
28652862
FA0E0597ED415901958AD5AE = {isa = PBXGroup; children = (
28662863
99E1BC08B886CFDD2CCFD462, ); name = Products; sourceTree = "<group>"; };
@@ -3107,7 +3104,6 @@
31073104
E100912B2FCE36A30D097C95,
31083105
CAB9D9DEF279F93132B45F90,
31093106
CA4DCF67B48352BE633A616D,
3110-
FD4865450F4C47FF3C6327FE,
31113107
512D7D16D0A95BDD0D6D6E45, ); runOnlyForDeploymentPostprocessing = 0; };
31123108
609761DEC9151D2CDD50270C = {isa = PBXNativeTarget; buildConfigurationList = B0259CB1FA28CEC89ED4FA14; buildPhases = (
31133109
256EEB2E7946EFA9B0774D25,

‎JuceLibraryCode/AppConfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
#endif
187187

188188
#ifndef JUCE_QUICKTIME
189-
//#define JUCE_QUICKTIME
189+
#define JUCE_QUICKTIME 0
190190
#endif
191191

192192
#ifndef JUCE_USE_CAMERA

‎JuceLibraryCode/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ static CGBitmapInfo getCGImageFlags (const Image::PixelFormat& format)
507507
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
508508
// There's a bug in CGContextDrawTiledImage that makes it incredibly slow
509509
// if it's doing a transformation - it's quicker to just draw lots of images manually
510-
if (CGContextDrawTiledImage != 0 && transform.isOnlyTranslation())
510+
if (&CGContextDrawTiledImage != 0 && transform.isOnlyTranslation())
511511
CGContextDrawTiledImage (context, imageRect, image);
512512
else
513513
#endif

‎JuceLibraryCode/modules/juce_gui_basics/native/juce_mac_FileChooser.mm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,10 @@ static BOOL shouldShowFilename (id self, SEL, id /*sender*/, NSString* filename)
172172
[panel setDirectoryURL: [NSURL fileURLWithPath: juceStringToNS (directory)]];
173173
[panel setNameFieldStringValue: juceStringToNS (filename)];
174174

175+
#pragma GCC diagnostic push
176+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
175177
if ([panel runModal] == NSOKButton)
178+
#pragma GCC diagnostic pop
176179
#else
177180
if ([panel runModalForDirectory: juceStringToNS (directory)
178181
file: juceStringToNS (filename)] == NSOKButton)

‎JuceLibraryCode/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,10 @@ void redirectMouseMove (NSEvent* ev)
555555

556556
#if defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
557557
if ([NSWindow respondsToSelector: @selector (windowNumberAtPoint:belowWindowWithWindowNumber:)]
558+
#pragma GCC diagnostic push
559+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
558560
&& [NSWindow windowNumberAtPoint: [[ev window] convertBaseToScreen: [ev locationInWindow]]
561+
#pragma GCC diagnostic pop
559562
belowWindowWithWindowNumber: 0] != [window windowNumber])
560563
{
561564
// moved into another window which overlaps this one, so trigger an exit

‎JuceLibraryCode/modules/juce_gui_basics/native/juce_mac_Windowing.mm‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,11 @@ int getResult() const
4545
{
4646
switch (getRawResult())
4747
{
48+
#pragma GCC diagnostic push
49+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
4850
case NSAlertDefaultReturn: return 1;
4951
case NSAlertOtherReturn: return 2;
52+
#pragma GCC diagnostic pop
5053
default: return 0;
5154
}
5255
}
@@ -97,9 +100,12 @@ NSInteger getRawResult() const
97100

98101
switch (iconType)
99102
{
103+
#pragma GCC diagnostic push
104+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
100105
case AlertWindow::InfoIcon: return NSRunInformationalAlertPanel (ttl, msg, b1, b2, b3);
101106
case AlertWindow::WarningIcon: return NSRunCriticalAlertPanel (ttl, msg, b1, b2, b3);
102107
default: return NSRunAlertPanel (ttl, msg, b1, b2, b3);
108+
#pragma GCC diagnostic pop
103109
}
104110
}
105111
};
@@ -185,13 +191,16 @@ NSInteger getRawResult() const
185191
dragPosition.x -= 16;
186192
dragPosition.y -= 16;
187193

194+
#pragma GCC diagnostic push
195+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
188196
[view dragImage: [[NSWorkspace sharedWorkspace] iconForFile: juceStringToNS (files[0])]
189197
at: dragPosition
190198
offset: NSMakeSize (0, 0)
191199
event: [[view window] currentEvent]
192200
pasteboard: pboard
193201
source: view
194202
slideBack: YES];
203+
#pragma GCC diagnostic pop
195204
}
196205

197206
return true;

‎JuceLibraryCode/modules/juce_gui_basics/widgets/juce_Toolbar.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,8 @@ void Toolbar::itemDragMove (const SourceDetails& dragSourceDetails)
591591
{
592592
const Rectangle<int> previousPos (animator.getComponentDestination (prev));
593593

594-
if (abs (dragObjectLeft - (vertical ? previousPos.getY() : previousPos.getX())
595-
< abs (dragObjectRight - (vertical ? current.getBottom() : current.getRight()))))
594+
if (abs (dragObjectLeft - (vertical ? previousPos.getY() : previousPos.getX()))
595+
< abs (dragObjectRight - (vertical ? current.getBottom() : current.getRight())))
596596
{
597597
newIndex = getIndexOfChildComponent (prev);
598598
}
@@ -602,8 +602,8 @@ void Toolbar::itemDragMove (const SourceDetails& dragSourceDetails)
602602
{
603603
const Rectangle<int> nextPos (animator.getComponentDestination (next));
604604

605-
if (abs (dragObjectLeft - (vertical ? current.getY() : current.getX())
606-
> abs (dragObjectRight - (vertical ? nextPos.getBottom() : nextPos.getRight()))))
605+
if (abs (dragObjectLeft - (vertical ? current.getY() : current.getX()))
606+
> abs (dragObjectRight - (vertical ? nextPos.getBottom() : nextPos.getRight())))
607607
{
608608
newIndex = getIndexOfChildComponent (next) + 1;
609609
}

‎JuceLibraryCode/modules/juce_opengl/native/juce_OpenGL_osx.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ class OpenGLContext::NativeContext
4040
NSOpenGLPFAOpenGLProfile, version >= openGL3_2 ? NSOpenGLProfileVersion3_2Core : NSOpenGLProfileVersionLegacy,
4141
#endif
4242
NSOpenGLPFADoubleBuffer,
43+
#pragma GCC diagnostic push
44+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
4345
NSOpenGLPFAMPSafe,
46+
#pragma GCC diagnostic pop
4447
NSOpenGLPFAClosestPolicy,
4548
NSOpenGLPFANoRecovery,
4649
NSOpenGLPFAColorSize, (NSOpenGLPixelFormatAttribute) (pixFormat.redBits + pixFormat.greenBits + pixFormat.blueBits),

‎Source/CoreServices.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void setRecordingStatus(bool enable)
5252
getControlPanel()->setRecordState(enable);
5353
}
5454

55-
void sendStatusMessage(String& text)
55+
void sendStatusMessage(const String& text)
5656
{
5757
getBroadcaster()->sendActionMessage(text);
5858
}

0 commit comments

Comments
 (0)