Merge branch 'dev'

Author: emufreak

Classes/AudioService.h

@@ -0,0 +1,36 @@
+//  Created by Simon Toens on 04.10.16
+//
+//  iUAE is free software: you may copy, redistribute
+//  and/or modify it under the terms of the GNU General Public License as
+//  published by the Free Software Foundation, either version 2 of the
+//  License, or (at your option) any later version.
+//
+//  This file is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+#import <Foundation/Foundation.h>
+
+/**
+ * The audio service handles interactions with the sound subsystem.
+ *
+ * Note that this class uses the emulator state as source of truth, it does not/should not read configuration.
+ */
+@interface AudioService : NSObject
+
+/**
+ * Sets the emulator volume: 0 = min, 1 = max.
+ */
+- (void)setVolume:(float)volume;
+
+/**
+ * Returns the emulator volume: 0 = min, 1 = max.
+ */
+- (float)getVolume;
+
+@end

Classes/AudioService.mm

@@ -0,0 +1,35 @@
+//  Created by Simon Toens on 04.10.16
+//
+//  iUAE is free software: you may copy, redistribute
+//  and/or modify it under the terms of the GNU General Public License as
+//  published by the Free Software Foundation, either version 2 of the
+//  License, or (at your option) any later version.
+//
+//  This file is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+#include "sysconfig.h"
+#include "sysdeps.h"
+#include "options.h"
+#include "fame.h"
+#include "audio.h"
+
+#import "AudioService.h"
+
+@implementation AudioService
+
+- (void)setVolume:(float)volume {
+    set_audio_volume(volume);
+}
+
+- (float)getVolume {
+    return get_audio_volume();
+}
+
+@end

Classes/CoreSetting.h

@@ -17,6 +17,7 @@
 #import <Foundation/Foundation.h>
 #import "CoreSettingGroup.h"
 
+//Wrapper Methods for C++ calls
 /**
  * A special setting (property/switch/toggle) that requires an emulator reset to take effect.  For example, the rom being used.
  *
@@ -54,12 +55,18 @@
 
 @interface DriveServiceBasedCoreSetting : CoreSetting @end // abstract
 @interface DiskDriveEnabledCoreSetting : DriveServiceBasedCoreSetting @end // abstract
-@interface RomCoreSetting : DriveServiceBasedCoreSetting @end
+
+@interface RomCoreSetting : DriveServiceBasedCoreSetting
++ (RomCoreSetting *)getInstance;
+@end
+
 @interface DF1EnabledCoreSetting : DiskDriveEnabledCoreSetting @end
 @interface DF2EnabledCoreSetting : DiskDriveEnabledCoreSetting @end
 @interface DF3EnabledCoreSetting : DiskDriveEnabledCoreSetting @end
 @interface HardDriveBasedCoreSetting : CoreSetting @end // abstract
-@interface HD0PathCoreSetting : HardDriveBasedCoreSetting <CoreSettingGroupMember> @end
+@interface HD0PathCoreSetting : HardDriveBasedCoreSetting <CoreSettingGroupMember>
++ (HD0PathCoreSetting *)getInstance;
+@end
 @interface HD0ReadOnlyCoreSetting : HardDriveBasedCoreSetting <CoreSettingGroupMember> @end
 @interface HD0SettingGroup : NSObject <CoreSettingGroup> @end
 @interface NTSCEnabledCoreSetting : CoreSetting @end
@@ -87,3 +94,5 @@
 + (NTSCEnabledCoreSetting *)ntscEnabledCoreSetting;
 
 @end
+
+