From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2H4M-0001vb-6A for qemu-devel@nongnu.org; Tue, 09 Jun 2015 06:47:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2H4J-0004eq-0u for qemu-devel@nongnu.org; Tue, 09 Jun 2015 06:47:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2H4I-0004eO-Pd for qemu-devel@nongnu.org; Tue, 09 Jun 2015 06:47:42 -0400 From: Gerd Hoffmann Date: Tue, 9 Jun 2015 12:47:30 +0200 Message-Id: <1433846851-20552-12-git-send-email-kraxel@redhat.com> In-Reply-To: <1433846851-20552-1-git-send-email-kraxel@redhat.com> References: <1433846851-20552-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 11/12] coreaudio: do not use global variables where possible List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Vassili Karpov (malc)" , Gerd Hoffmann , =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= From: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n Signed-off-by: Gerd Hoffmann --- audio/coreaudio.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index 20346bc..6dfd63e 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -32,20 +32,16 @@ #define AUDIO_CAP "coreaudio" #include "audio_int.h" =20 -struct { +static int isAtexit; + +typedef struct { int buffer_frames; int nbuffers; - int isAtexit; -} conf =3D { - .buffer_frames =3D 512, - .nbuffers =3D 4, - .isAtexit =3D 0 -}; +} CoreaudioConf; =20 typedef struct coreaudioVoiceOut { HWVoiceOut hw; pthread_mutex_t mutex; - int isAtexit; AudioDeviceID outputDeviceID; UInt32 audioDevicePropertyBufferFrameSize; AudioStreamBasicDescription outputStreamBasicDescription; @@ -161,7 +157,7 @@ static inline UInt32 isPlaying (AudioDeviceID outputD= eviceID) =20 static void coreaudio_atexit (void) { - conf.isAtexit =3D 1; + isAtexit =3D 1; } =20 static int coreaudio_lock (coreaudioVoiceOut *core, const char *fn_name) @@ -296,6 +292,7 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct = audsettings *as, int err; const char *typ =3D "playback"; AudioValueRange frameRange; + CoreaudioConf *conf =3D drv_opaque; =20 /* create mutex */ err =3D pthread_mutex_init(&core->mutex, NULL); @@ -337,16 +334,16 @@ static int coreaudio_init_out(HWVoiceOut *hw, struc= t audsettings *as, return -1; } =20 - if (frameRange.mMinimum > conf.buffer_frames) { + if (frameRange.mMinimum > conf->buffer_frames) { core->audioDevicePropertyBufferFrameSize =3D (UInt32) frameRange= .mMinimum; dolog ("warning: Upsizing Buffer Frames to %f\n", frameRange.mMi= nimum); } - else if (frameRange.mMaximum < conf.buffer_frames) { + else if (frameRange.mMaximum < conf->buffer_frames) { core->audioDevicePropertyBufferFrameSize =3D (UInt32) frameRange= .mMaximum; dolog ("warning: Downsizing Buffer Frames to %f\n", frameRange.m= Maximum); } else { - core->audioDevicePropertyBufferFrameSize =3D conf.buffer_frames; + core->audioDevicePropertyBufferFrameSize =3D conf->buffer_frames= ; } =20 /* set Buffer Frame Size */ @@ -380,7 +377,7 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct = audsettings *as, "Could not get device buffer frame size\n"); return -1; } - hw->samples =3D conf.nbuffers * core->audioDevicePropertyBufferFrame= Size; + hw->samples =3D conf->nbuffers * core->audioDevicePropertyBufferFram= eSize; =20 /* get StreamFormat */ propertySize =3D sizeof(core->outputStreamBasicDescription); @@ -444,7 +441,7 @@ static void coreaudio_fini_out (HWVoiceOut *hw) int err; coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hw; =20 - if (!conf.isAtexit) { + if (!isAtexit) { /* stop playback */ if (isPlaying(core->outputDeviceID)) { status =3D AudioDeviceStop(core->outputDeviceID, audioDevice= IOProc); @@ -487,7 +484,7 @@ static int coreaudio_ctl_out (HWVoiceOut *hw, int cmd= , ...) =20 case VOICE_DISABLE: /* stop playback */ - if (!conf.isAtexit) { + if (!isAtexit) { if (isPlaying(core->outputDeviceID)) { status =3D AudioDeviceStop(core->outputDeviceID, audioDe= viceIOProc); if (status !=3D kAudioHardwareNoError) { @@ -500,28 +497,36 @@ static int coreaudio_ctl_out (HWVoiceOut *hw, int c= md, ...) return 0; } =20 +static CoreaudioConf glob_conf =3D { + .buffer_frames =3D 512, + .nbuffers =3D 4, +}; + static void *coreaudio_audio_init (void) { + CoreaudioConf *conf =3D g_malloc(sizeof(CoreaudioConf)); + *conf =3D glob_conf; + atexit(coreaudio_atexit); - return &coreaudio_audio_init; + return conf; } =20 static void coreaudio_audio_fini (void *opaque) { - (void) opaque; + g_free(opaque); } =20 static struct audio_option coreaudio_options[] =3D { { .name =3D "BUFFER_SIZE", .tag =3D AUD_OPT_INT, - .valp =3D &conf.buffer_frames, + .valp =3D &glob_conf.buffer_frames, .descr =3D "Size of the buffer in frames" }, { .name =3D "BUFFER_COUNT", .tag =3D AUD_OPT_INT, - .valp =3D &conf.nbuffers, + .valp =3D &glob_conf.nbuffers, .descr =3D "Number of buffers" }, { /* End of list */ } --=20 1.8.3.1