enlightenment/evisum
enlightenment
/
evisum
7
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

macos: use newer audio API for 10.11.

This commit is contained in:
Alastair Poole 2018-10-24 18:03:38 +01:00
parent d7523502fe
commit 11832c587a
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tingle/README
View File

@ -13,9 +13,6 @@ This can be used with pipes by other processes to
query the hardware. Or just to display a status query the hardware. Or just to display a status
line in screen or tmux or some Xorg program. line in screen or tmux or some Xorg program.
If I'd thought more about it I'd have made it modular, so
apologies for the crust!
Install: Install:
make (or gmake) make (or gmake)

2
src/tingle/makefile
View File

@ -10,7 +10,7 @@ HAVE_ALSA := $(shell if [ $(ALSA_TEST) -eq 0 ]; then echo "true"; else echo "fal
UNAME := $(shell uname -s) UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)
CFLAGS += -framework AudioToolBox CFLAGS += -framework CoreAudio
else ifeq ($(UNAME),Linux) else ifeq ($(UNAME),Linux)
ifeq ($(HAVE_ALSA),true) ifeq ($(HAVE_ALSA),true)
CFLAGS += -lasound -DHAVE_ALSA=1 CFLAGS += -lasound -DHAVE_ALSA=1

10
src/tingle/tingle.c
View File

@ -182,7 +182,7 @@ Fcontents(const char *path)
int n = 1024; int n = 1024;
buf = malloc(n * sizeof(byte) + 1); buf = malloc(n * sizeof(byte) + 1);
if (!buf) exit(0 << 1); if (!buf) return NULL;
while ((count = (fread(byte, sizeof(byte), 1, f))) > 0) while ((count = (fread(byte, sizeof(byte), 1, f))) > 0)
{ {
@ -191,13 +191,13 @@ Fcontents(const char *path)
{ {
n *= 2; n *= 2;
char *tmp = realloc(buf, n * sizeof(byte) + 1); char *tmp = realloc(buf, n * sizeof(byte) + 1);
if (!tmp) exit(1 << 1); if (!tmp) return NULL;
buf = tmp; buf = tmp;
} }
memcpy(&buf[bytes - sizeof(byte)], byte, sizeof(byte)); memcpy(&buf[bytes - sizeof(byte)], byte, sizeof(byte));
} }
if (!feof(f)) exit(2 << 1); if (!feof(f)) return NULL;
fclose(f); fclose(f);
buf[bytes] = 0; buf[bytes] = 0;
@ -848,14 +848,14 @@ out:
prop.mScope = kAudioObjectPropertyScopeGlobal; prop.mScope = kAudioObjectPropertyScopeGlobal;
prop.mElement = kAudioObjectPropertyElementMaster; prop.mElement = kAudioObjectPropertyElementMaster;
if (AudioHardwareServiceGetPropertyData(kAudioObjectSystemObject, &prop, 0, NULL, &id_size, &id)) if (AudioObjectGetPropertyData(kAudioObjectSystemObject, &prop, 0, NULL, &id_size, &id))
return (0); return (0);
prop.mSelector = kAudioDevicePropertyVolumeScalar; prop.mSelector = kAudioDevicePropertyVolumeScalar;
prop.mScope = kAudioDevicePropertyScopeOutput; prop.mScope = kAudioDevicePropertyScopeOutput;
prop.mElement = 0; prop.mElement = 0;
if (AudioHardwareServiceGetPropertyData(id, &prop, 0, NULL, &vol_size, &volume)) if (AudioObjectGetPropertyData(id, &prop, 0, NULL, &vol_size, &volume))
return (0); return (0);
mixer->volume_left = mixer->volume_right = volume * 100; mixer->volume_left = mixer->volume_right = volume * 100;