summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/sound/coreaudio_sound.c30
-rw-r--r--src/osd/osdcomm.h2
-rw-r--r--src/osd/sdl/sdlprefix.h1
-rw-r--r--src/osd/windows/video.c2
4 files changed, 17 insertions, 18 deletions
diff --git a/src/osd/modules/sound/coreaudio_sound.c b/src/osd/modules/sound/coreaudio_sound.c
index 9090a937826..e6039d0c233 100644
--- a/src/osd/modules/sound/coreaudio_sound.c
+++ b/src/osd/modules/sound/coreaudio_sound.c
@@ -847,9 +847,9 @@ bool sound_coreaudio::extract_effect_info(
CFTypeRef subtype_val = NULL;
CFTypeRef manufacturer_val = NULL;
if (CFDictionaryContainsKey(desc, CFSTR("ComponentType"))
- && CFDictionaryContainsKey(desc, CFSTR("ComponentSubType"))
- && CFDictionaryContainsKey(desc, CFSTR("ComponentManufacturer"))
- && CFDictionaryContainsKey(desc, CFSTR("ClassInfo")))
+ && CFDictionaryContainsKey(desc, CFSTR("ComponentSubType"))
+ && CFDictionaryContainsKey(desc, CFSTR("ComponentManufacturer"))
+ && CFDictionaryContainsKey(desc, CFSTR("ClassInfo")))
{
type_val = CFDictionaryGetValue(desc, CFSTR("ComponentType"));
subtype_val = CFDictionaryGetValue(desc, CFSTR("ComponentSubType"));
@@ -857,8 +857,8 @@ bool sound_coreaudio::extract_effect_info(
class_info = CFDictionaryGetValue(desc, CFSTR("ClassInfo"));
}
else if (CFDictionaryContainsKey(desc, CFSTR(kAUPresetTypeKey))
- && CFDictionaryContainsKey(desc, CFSTR(kAUPresetSubtypeKey))
- && CFDictionaryContainsKey(desc, CFSTR(kAUPresetManufacturerKey)))
+ && CFDictionaryContainsKey(desc, CFSTR(kAUPresetSubtypeKey))
+ && CFDictionaryContainsKey(desc, CFSTR(kAUPresetManufacturerKey)))
{
type_val = CFDictionaryGetValue(desc, CFSTR(kAUPresetTypeKey));
subtype_val = CFDictionaryGetValue(desc, CFSTR(kAUPresetSubtypeKey));
@@ -875,16 +875,16 @@ bool sound_coreaudio::extract_effect_info(
SInt64 type_int, subtype_int, manufacturer_int;
if ((NULL == type_val)
- || (NULL == subtype_val)
- || (NULL == manufacturer_val)
- || (NULL == class_info)
- || (CFNumberGetTypeID() != CFGetTypeID(type_val))
- || (CFNumberGetTypeID() != CFGetTypeID(subtype_val))
- || (CFNumberGetTypeID() != CFGetTypeID(manufacturer_val))
- || (CFDictionaryGetTypeID() != CFGetTypeID(class_info))
- || !CFNumberGetValue((CFNumberRef)type_val, kCFNumberSInt64Type, &type_int)
- || !CFNumberGetValue((CFNumberRef)subtype_val, kCFNumberSInt64Type, &subtype_int)
- || !CFNumberGetValue((CFNumberRef)manufacturer_val, kCFNumberSInt64Type, &manufacturer_int))
+ || (NULL == subtype_val)
+ || (NULL == manufacturer_val)
+ || (NULL == class_info)
+ || (CFNumberGetTypeID() != CFGetTypeID(type_val))
+ || (CFNumberGetTypeID() != CFGetTypeID(subtype_val))
+ || (CFNumberGetTypeID() != CFGetTypeID(manufacturer_val))
+ || (CFDictionaryGetTypeID() != CFGetTypeID(class_info))
+ || !CFNumberGetValue((CFNumberRef)type_val, kCFNumberSInt64Type, &type_int)
+ || !CFNumberGetValue((CFNumberRef)subtype_val, kCFNumberSInt64Type, &subtype_int)
+ || !CFNumberGetValue((CFNumberRef)manufacturer_val, kCFNumberSInt64Type, &manufacturer_int))
{
osd_printf_error(
"%s is not a valid AudioUnit effect description: incorrect property type(s)\n",
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h
index ddcb0bc9490..2df16b8db02 100644
--- a/src/osd/osdcomm.h
+++ b/src/osd/osdcomm.h
@@ -226,7 +226,7 @@ typedef UINT32 FPTR;
#ifdef _MSC_VER
#include <malloc.h>
#if _MSC_VER == 1900 // < VS2015
-#define __LINE__Var 0
+#define __LINE__Var 0
#endif
#if _MSC_VER < 1900 // < VS2015
#define snprintf _snprintf
diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h
index ed1b2e11204..f46bf2a22df 100644
--- a/src/osd/sdl/sdlprefix.h
+++ b/src/osd/sdl/sdlprefix.h
@@ -81,4 +81,3 @@ struct _IO_FILE {}; //_IO_FILE is an opaque type in the emscripten libc which m
#endif
#endif /* SDLMAME_UNIX */
-
diff --git a/src/osd/windows/video.c b/src/osd/windows/video.c
index e52d09c7374..d135d7a2bc9 100644
--- a/src/osd/windows/video.c
+++ b/src/osd/windows/video.c
@@ -135,7 +135,7 @@ void win_monitor_info::refresh()
char *temp = utf8_from_tstring(m_info.szDevice);
if (temp) strncpy(m_name, temp, sizeof(m_name));
-
+
osd_free(temp);
m_pos_size = RECT_to_osd_rect(m_info.rcMonitor);