Fix compilation on macOS and iOS. Minor cleanup.

--HG--
branch : minor

platform/xcode/liblove.xcodeproj/project.pbxproj

@@ -883,6 +883,18 @@
 		FA4F2B791DE0125B00CA37D7 /* xxhash.c in Sources */ = {isa = PBXBuildFile; fileRef = FA4F2B771DE0125B00CA37D7 /* xxhash.c */; };
 		FA4F2B7A1DE0125B00CA37D7 /* xxhash.h in Headers */ = {isa = PBXBuildFile; fileRef = FA4F2B781DE0125B00CA37D7 /* xxhash.h */; };
 		FA4F2B7B1DE0181B00CA37D7 /* xxhash.c in Sources */ = {isa = PBXBuildFile; fileRef = FA4F2B771DE0125B00CA37D7 /* xxhash.c */; };
+		FA4F2BA61DE1E36400CA37D7 /* RecordingDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4F2BA21DE1E36400CA37D7 /* RecordingDevice.cpp */; };
+		FA4F2BA71DE1E36400CA37D7 /* RecordingDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = FA4F2BA31DE1E36400CA37D7 /* RecordingDevice.h */; };
+		FA4F2BA81DE1E36400CA37D7 /* wrap_RecordingDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4F2BA41DE1E36400CA37D7 /* wrap_RecordingDevice.cpp */; };
+		FA4F2BA91DE1E36400CA37D7 /* wrap_RecordingDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = FA4F2BA51DE1E36400CA37D7 /* wrap_RecordingDevice.h */; };
+		FA4F2BAC1DE1E37000CA37D7 /* RecordingDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4F2BAA1DE1E37000CA37D7 /* RecordingDevice.cpp */; };
+		FA4F2BAD1DE1E37000CA37D7 /* RecordingDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = FA4F2BAB1DE1E37000CA37D7 /* RecordingDevice.h */; };
+		FA4F2BB01DE1E37B00CA37D7 /* RecordingDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4F2BAE1DE1E37B00CA37D7 /* RecordingDevice.cpp */; };
+		FA4F2BB11DE1E37B00CA37D7 /* RecordingDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = FA4F2BAF1DE1E37B00CA37D7 /* RecordingDevice.h */; };
+		FA4F2BB21DE1E4B400CA37D7 /* RecordingDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4F2BAE1DE1E37B00CA37D7 /* RecordingDevice.cpp */; };
+		FA4F2BB31DE1E4B800CA37D7 /* RecordingDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4F2BA21DE1E36400CA37D7 /* RecordingDevice.cpp */; };
+		FA4F2BB41DE1E4BD00CA37D7 /* RecordingDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4F2BAA1DE1E37000CA37D7 /* RecordingDevice.cpp */; };
+		FA4F2BB51DE1E4C300CA37D7 /* wrap_RecordingDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA4F2BA41DE1E36400CA37D7 /* wrap_RecordingDevice.cpp */; };
 		FA56D9BC1C208A0200D8D3C7 /* libmodplug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA56D9BA1C2089EE00D8D3C7 /* libmodplug.a */; };
 		FA577AB016C7507900860150 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA577A7916C71A1700860150 /* Cocoa.framework */; };
 		FA577AC216C7512D00860150 /* FreeType.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA577A6716C719D900860150 /* FreeType.framework */; };
@@ -1580,6 +1592,14 @@
 		FA4B66C81ABBCF1900558F15 /* Timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Timer.cpp; sourceTree = "<group>"; };
 		FA4F2B771DE0125B00CA37D7 /* xxhash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xxhash.c; sourceTree = "<group>"; };
 		FA4F2B781DE0125B00CA37D7 /* xxhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xxhash.h; sourceTree = "<group>"; };
+		FA4F2BA21DE1E36400CA37D7 /* RecordingDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecordingDevice.cpp; sourceTree = "<group>"; };
+		FA4F2BA31DE1E36400CA37D7 /* RecordingDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordingDevice.h; sourceTree = "<group>"; };
+		FA4F2BA41DE1E36400CA37D7 /* wrap_RecordingDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_RecordingDevice.cpp; sourceTree = "<group>"; };
+		FA4F2BA51DE1E36400CA37D7 /* wrap_RecordingDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_RecordingDevice.h; sourceTree = "<group>"; };
+		FA4F2BAA1DE1E37000CA37D7 /* RecordingDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecordingDevice.cpp; sourceTree = "<group>"; };
+		FA4F2BAB1DE1E37000CA37D7 /* RecordingDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordingDevice.h; sourceTree = "<group>"; };
+		FA4F2BAE1DE1E37B00CA37D7 /* RecordingDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecordingDevice.cpp; sourceTree = "<group>"; };
+		FA4F2BAF1DE1E37B00CA37D7 /* RecordingDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordingDevice.h; sourceTree = "<group>"; };
 		FA56D9BA1C2089EE00D8D3C7 /* libmodplug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmodplug.a; sourceTree = "<group>"; };
 		FA577A6716C719D900860150 /* FreeType.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FreeType.framework; path = /Library/Frameworks/FreeType.framework; sourceTree = "<absolute>"; };
 		FA577A6D16C719EA00860150 /* Lua.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Lua.framework; path = /Library/Frameworks/Lua.framework; sourceTree = "<absolute>"; };
@@ -2201,10 +2221,14 @@
 				FA0B7B3F1A95902C000E1D17 /* Audio.h */,
 				FA0B7B401A95902C000E1D17 /* null */,
 				FA0B7B451A95902C000E1D17 /* openal */,
+				FA4F2BA21DE1E36400CA37D7 /* RecordingDevice.cpp */,
+				FA4F2BA31DE1E36400CA37D7 /* RecordingDevice.h */,
 				FA0B7B4C1A95902C000E1D17 /* Source.cpp */,
 				FA0B7B4D1A95902C000E1D17 /* Source.h */,
 				FA0B7B4E1A95902C000E1D17 /* wrap_Audio.cpp */,
 				FA0B7B4F1A95902C000E1D17 /* wrap_Audio.h */,
+				FA4F2BA41DE1E36400CA37D7 /* wrap_RecordingDevice.cpp */,
+				FA4F2BA51DE1E36400CA37D7 /* wrap_RecordingDevice.h */,
 				FA0B7B501A95902C000E1D17 /* wrap_Source.cpp */,
 				FA0B7B511A95902C000E1D17 /* wrap_Source.h */,
 			);
@@ -2216,6 +2240,8 @@
 			children = (
 				FA0B7B411A95902C000E1D17 /* Audio.cpp */,
 				FA0B7B421A95902C000E1D17 /* Audio.h */,
+				FA4F2BAA1DE1E37000CA37D7 /* RecordingDevice.cpp */,
+				FA4F2BAB1DE1E37000CA37D7 /* RecordingDevice.h */,
 				FA0B7B431A95902C000E1D17 /* Source.cpp */,
 				FA0B7B441A95902C000E1D17 /* Source.h */,
 			);
@@ -2229,6 +2255,8 @@
 				FA0B7B471A95902C000E1D17 /* Audio.h */,
 				FA0B7B481A95902C000E1D17 /* Pool.cpp */,
 				FA0B7B491A95902C000E1D17 /* Pool.h */,
+				FA4F2BAE1DE1E37B00CA37D7 /* RecordingDevice.cpp */,
+				FA4F2BAF1DE1E37B00CA37D7 /* RecordingDevice.h */,
 				FA0B7B4A1A95902C000E1D17 /* Source.cpp */,
 				FA0B7B4B1A95902C000E1D17 /* Source.h */,
 			);
@@ -3038,6 +3066,7 @@
 				FA0B7D381A95902C000E1D17 /* Font.h in Headers */,
 				FA0B7EC31A95902C000E1D17 /* threads.h in Headers */,
 				FA0B7AC21A958EA3000E1D17 /* enet.h in Headers */,
+				FA4F2BA71DE1E36400CA37D7 /* RecordingDevice.h in Headers */,
 				FA0B7E201A95902C000E1D17 /* Physics.h in Headers */,
 				217DFBEA1D9F6D490055D849 /* io.h in Headers */,
 				FA0B79221A958E3B000E1D17 /* delay.h in Headers */,
@@ -3189,6 +3218,7 @@
 				FA0B7A341A958EA3000E1D17 /* b2Collision.h in Headers */,
 				217DFBDA1D9F6D490055D849 /* auxiliar.h in Headers */,
 				FA0B7EC71A95902C000E1D17 /* ThreadModule.h in Headers */,
+				FA4F2BAD1DE1E37000CA37D7 /* RecordingDevice.h in Headers */,
 				FA0B792B1A958E3B000E1D17 /* Matrix.h in Headers */,
 				FA0B7DA41A95902C000E1D17 /* PKMHandler.h in Headers */,
 				FA0B7AC81A958EA3000E1D17 /* utility.h in Headers */,
@@ -3257,6 +3287,7 @@
 				FA0B7D0B1A95902C000E1D17 /* wrap_FileData.h in Headers */,
 				FA0B7DF91A95902C000E1D17 /* Body.h in Headers */,
 				FA0B7DB91A95902C000E1D17 /* Joystick.h in Headers */,
+				FA4F2BB11DE1E37B00CA37D7 /* RecordingDevice.h in Headers */,
 				FA0B7E2C1A95902C000E1D17 /* RevoluteJoint.h in Headers */,
 				FA8951A41AA2EDF300EC385A /* wrap_Event.h in Headers */,
 				FA0B7B2A1A958EA3000E1D17 /* simplexnoise1234.h in Headers */,
@@ -3299,6 +3330,7 @@
 				FA0B79451A958E3B000E1D17 /* Variant.h in Headers */,
 				FA0B7D691A95902C000E1D17 /* wrap_ParticleSystem.h in Headers */,
 				FA0B7E5C1A95902C000E1D17 /* wrap_MotorJoint.h in Headers */,
+				FA4F2BA91DE1E36400CA37D7 /* wrap_RecordingDevice.h in Headers */,
 				FA0B7A7C1A958EA3000E1D17 /* b2Contact.h in Headers */,
 				FA0B7A881A958EA3000E1D17 /* b2PolygonAndCircleContact.h in Headers */,
 				FA4F2B7A1DE0125B00CA37D7 /* xxhash.h in Headers */,
@@ -3519,6 +3551,7 @@
 				FA0B7A3F1A958EA3000E1D17 /* b2ChainShape.cpp in Sources */,
 				FA0B7E921A95902C000E1D17 /* ModPlugDecoder.cpp in Sources */,
 				FA0B7E521A95902C000E1D17 /* wrap_FrictionJoint.cpp in Sources */,
+				FA4F2BB51DE1E4C300CA37D7 /* wrap_RecordingDevice.cpp in Sources */,
 				FA0B7A311A958EA3000E1D17 /* b2CollidePolygon.cpp in Sources */,
 				FA0B7A931A958EA3000E1D17 /* b2GearJoint.cpp in Sources */,
 				FA0B7E0D1A95902C000E1D17 /* Fixture.cpp in Sources */,
@@ -3576,6 +3609,7 @@
 				FA0B7A871A958EA3000E1D17 /* b2PolygonAndCircleContact.cpp in Sources */,
 				FA0B7EF21A959D2C000E1D17 /* ios.mm in Sources */,
 				FA0B7D3A1A95902C000E1D17 /* Graphics.cpp in Sources */,
+				FA4F2BB21DE1E4B400CA37D7 /* RecordingDevice.cpp in Sources */,
 				FA0B7A2D1A958EA3000E1D17 /* b2CollideCircle.cpp in Sources */,
 				FA59A2D31C06481400328DBA /* ParticleSystem.cpp in Sources */,
 				FA0B7E131A95902C000E1D17 /* GearJoint.cpp in Sources */,
@@ -3615,6 +3649,7 @@
 				FA0B7E2B1A95902C000E1D17 /* RevoluteJoint.cpp in Sources */,
 				FA0B7B291A958EA3000E1D17 /* simplexnoise1234.cpp in Sources */,
 				FA0B7D261A95902C000E1D17 /* wrap_Font.cpp in Sources */,
+				FA4F2BB31DE1E4B800CA37D7 /* RecordingDevice.cpp in Sources */,
 				FA0B7E0A1A95902C000E1D17 /* EdgeShape.cpp in Sources */,
 				FAB17BF11ABFB37500F9BA27 /* wrap_CompressedData.cpp in Sources */,
 				FA0B7CF81A95902C000E1D17 /* FileData.cpp in Sources */,
@@ -3646,6 +3681,7 @@
 				FA0B7CE31A95902C000E1D17 /* wrap_Audio.cpp in Sources */,
 				FA0B7B381A958EA3000E1D17 /* wuff_internal.c in Sources */,
 				FA0B7DF81A95902C000E1D17 /* Body.cpp in Sources */,
+				FA4F2BB41DE1E4BD00CA37D7 /* RecordingDevice.cpp in Sources */,
 				FA0B7DF51A95902C000E1D17 /* wrap_Mouse.cpp in Sources */,
 				FA0B7D6E1A95902C000E1D17 /* wrap_Shader.cpp in Sources */,
 				FA0B7E861A95902C000E1D17 /* CoreAudioDecoder.cpp in Sources */,
@@ -3767,7 +3803,9 @@
 				FA0B7E631A95902C000E1D17 /* wrap_PolygonShape.cpp in Sources */,
 				FA0B7E721A95902C000E1D17 /* wrap_Shape.cpp in Sources */,
 				FA0B7CFD1A95902C000E1D17 /* File.cpp in Sources */,
+				FA4F2BB01DE1E37B00CA37D7 /* RecordingDevice.cpp in Sources */,
 				FA27B39D1B498151008A9DCE /* Video.cpp in Sources */,
+				FA4F2BAC1DE1E37000CA37D7 /* RecordingDevice.cpp in Sources */,
 				FA0B7A2E1A958EA3000E1D17 /* b2CollideEdge.cpp in Sources */,
 				FA0B7E691A95902C000E1D17 /* wrap_PulleyJoint.cpp in Sources */,
 				FA0B7DB71A95902C000E1D17 /* Joystick.cpp in Sources */,
@@ -3924,6 +3962,7 @@
 				FA0B7A981A958EA3000E1D17 /* b2MotorJoint.cpp in Sources */,
 				FA0B7E061A95902C000E1D17 /* DistanceJoint.cpp in Sources */,
 				FA620A321AA2F8DB005DB4C2 /* wrap_Quad.cpp in Sources */,
+				FA4F2BA61DE1E36400CA37D7 /* RecordingDevice.cpp in Sources */,
 				FA0B793B1A958E3B000E1D17 /* runtime.cpp in Sources */,
 				FA0B7E5D1A95902C000E1D17 /* wrap_MouseJoint.cpp in Sources */,
 				FA0B7A741A958EA3000E1D17 /* b2ChainAndPolygonContact.cpp in Sources */,
@@ -4016,6 +4055,7 @@
 				FA0B7A891A958EA3000E1D17 /* b2PolygonContact.cpp in Sources */,
 				FA0B7E1E1A95902C000E1D17 /* Physics.cpp in Sources */,
 				FA0B7E811A95902C000E1D17 /* Shape.cpp in Sources */,
+				FA4F2BA81DE1E36400CA37D7 /* wrap_RecordingDevice.cpp in Sources */,
 				FA0B7B251A958EA3000E1D17 /* lutf8lib.c in Sources */,
 				FA0B7ED41A95902D000E1D17 /* Timer.cpp in Sources */,
 				FA19C4C51B4B0BD50059B0B3 /* wrap_Video.cpp in Sources */,

src/modules/audio/openal/Audio.cpp

@@ -356,7 +356,7 @@ const std::vector<love::audio::RecordingDevice*> &Audio::getRecordingDevices()
 
 	devices.reserve(devnames.size());
 	//build ordered list of devices
-	for (unsigned int i = 0; i < devnames.size(); i++)
+	for (int i = 0; i < (int) devnames.size(); i++)
 	{
 		devices.push_back(nullptr);
 		auto d = devices.end() - 1;

src/modules/audio/wrap_RecordingDevice.cpp

@@ -37,18 +37,17 @@ int w_RecordingDevice_startRecording(lua_State *L)
 	RecordingDevice *d = luax_checkrecordingdevice(L, 1);
 	if (lua_gettop(L) > 1)
 	{
-		int samples = luaL_checkinteger(L, 2);
-		int sampleRate = luaL_checkinteger(L, 3);
-		int bitDepth = luaL_checkinteger(L, 4);
-		int channels = luaL_checkinteger(L, 5);
+		int samples = (int) luaL_checkinteger(L, 2);
+		int sampleRate = (int) luaL_checkinteger(L, 3);
+		int bitDepth = (int) luaL_checkinteger(L, 4);
+		int channels = (int) luaL_checkinteger(L, 5);
 		luax_catchexcept(L, [&](){ 
 			lua_pushboolean(L, d->startRecording(samples, sampleRate, bitDepth, channels)); 
 		});
 	}
 	else
-		luax_catchexcept(L, [&](){ 
-			lua_pushboolean(L, d->startRecording()); 
-		});
+		luax_catchexcept(L, [&](){ lua_pushboolean(L, d->startRecording()); });
+
 	return 1;
 }
 
@@ -57,10 +56,9 @@ int w_RecordingDevice_stopRecording(lua_State *L)
 	RecordingDevice *d = luax_checkrecordingdevice(L, 1);
 	love::sound::SoundData *s = nullptr;
 
-	luax_catchexcept(L, [&](){ 
-		s = d->getData();
-		d->stopRecording();
-	});
+	luax_catchexcept(L, [&](){ s = d->getData(); });
+
+	d->stopRecording();
 
 	if (s != nullptr)
 	{
@@ -78,9 +76,7 @@ int w_RecordingDevice_getData(lua_State *L)
 	RecordingDevice *d = luax_checkrecordingdevice(L, 1);
 	love::sound::SoundData *s = nullptr;
 
-	luax_catchexcept(L, [&](){ 
-		s = d->getData();
-	});
+	luax_catchexcept(L, [&](){ s = d->getData(); });
 
 	if (s != nullptr)
 	{