ios: use NS_CLOSED_ENUM for intensity level

wireapp · Jul 4, 2024 · b927d6e · b927d6e
1 parent 05c5208
commit b927d6e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/iosx/include/AVSMediaManager.h b/iosx/include/AVSMediaManager.h
@@ -61,7 +61,7 @@ typedef NS_ENUM (NSUInteger, AVSRecordingRoute) {
 };
 
 
-typedef NS_ENUM (NSUInteger, AVSIntensityLevel) {
+typedef NS_CLOSED_ENUM (NSUInteger, AVSIntensityLevel) {
     AVSIntensityLevelNone = 0,
     AVSIntensityLevelSome = 50,
     AVSIntensityLevelFull = 100

diff --git a/iosx/src/mediamgr/AVSMediaManager+Client.m b/iosx/src/mediamgr/AVSMediaManager+Client.m
@@ -243,34 +243,13 @@ - (BOOL)isInControlOfAudio
 
 - (AVSIntensityLevel)intensityLevel
 {
-    float intensity = [self intensity];
-
-    if ( intensity == 0 ) {
-        return AVSIntensityLevelNone;
-    }
-
-    if ( intensity == 100 ) {
-        return AVSIntensityLevelFull;
-    }
-
-    return AVSIntensityLevelSome;
+    return [self intensity];
 }
 
-- (void)setIntensityLevel:(AVSIntensityLevel)intensityLevel
+- (void)setIntensityLevel:(AVSIntensityLevel)intensityLevel	
 {
-    switch ( intensityLevel ) {
-        case AVSIntensityLevelNone:
-            [self setIntensity:0];
-            break;
-
-        case AVSIntensityLevelSome:
-            [self setIntensity:50];
-            break;
-
-        case AVSIntensityLevelFull:
-            [self setIntensity:100];
-            break;
-    }
+
+	[self setIntensity:intensityLevel];
 }
 
 

diff --git a/iosx/src/mediamgr/AVSMediaManager.m b/iosx/src/mediamgr/AVSMediaManager.m
@@ -259,7 +259,7 @@ - (void)registerMedia:(id<AVSMedia>)media withOptions:(NSDictionary *)options
 {
 	bool mixing = true;
 	bool incall = false;
-	int intensity = 100;
+	int intensity = AVSIntensityLevelFull;
 	int priority = 0;
 
 	mediamgr_register_media(_mm, [media.name UTF8String], (__bridge_retained void *)(media),
@@ -386,7 +386,7 @@ - (void)setPreferredRecordingRoute:(AVSRecordingRoute)route
 
 - (float)intensityForMediaName:(NSString *)name
 {
-	return 0.0f;
+	return AVSIntensityLevelNone;
 }
 
 - (void)setIntensity:(float)intensity forMediaName:(NSString *)name