Commit b8b5a70c authored by Felix Paul Kühne's avatar Felix Paul Kühne

qtsound: drop legacy NSAutoreleasePool pattern

parent 210bdda1
......@@ -239,26 +239,25 @@ static int Open(vlc_object_t *p_this)
int audiocodec;
bool success;
NSString *qtk_curraudiodevice_uid;
NSAutoreleasePool *pool;
NSArray *myAudioDevices, *audioformat_array;
QTFormatDescription *audio_format;
QTCaptureDeviceInput *audioInput;
NSError *o_returnedAudioError;
@autoreleasepool {
if(p_demux->psz_location && *p_demux->psz_location)
psz_uid = p_demux->psz_location;
msg_Dbg(p_demux, "qtsound uid = %s", psz_uid);
qtk_curraudiodevice_uid = [[NSString alloc] initWithFormat:@"%s", psz_uid];
pool = [[NSAutoreleasePool alloc] init];
p_demux->p_sys = p_sys = calloc(1, sizeof(demux_sys_t));
if(!p_sys)
return VLC_ENOMEM;
msg_Dbg(p_demux, "qtsound : uid = %s", [qtk_curraudiodevice_uid UTF8String]);
myAudioDevices = [[[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeSound] arrayByAddingObjectsFromArray:[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeMuxed]] retain];
myAudioDevices = [[[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeSound]
arrayByAddingObjectsFromArray:[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeMuxed]] retain];
if([myAudioDevices count] == 0) {
dialog_FatalWait(p_demux, _("No Audio Input device found"),
_("Your Mac does not seem to be equipped with a suitable audio input device."
......@@ -271,8 +270,12 @@ static int Open(vlc_object_t *p_this)
for (iaudio = 0; iaudio < [myAudioDevices count]; iaudio++) {
QTCaptureDevice *qtk_audioDevice;
qtk_audioDevice = [myAudioDevices objectAtIndex:iaudio];
msg_Dbg(p_demux, "qtsound audio %u/%lu localizedDisplayName: %s uniqueID: %s", iaudio, [myAudioDevices count], [[qtk_audioDevice localizedDisplayName] UTF8String], [[qtk_audioDevice uniqueID] UTF8String]);
if ([[[qtk_audioDevice uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:qtk_curraudiodevice_uid]) {
msg_Dbg(p_demux, "qtsound audio %u/%lu localizedDisplayName: %s uniqueID: %s",
iaudio, [myAudioDevices count],
[[qtk_audioDevice localizedDisplayName] UTF8String],
[[qtk_audioDevice uniqueID] UTF8String]);
if ([[[qtk_audioDevice uniqueID] stringByTrimmingCharactersInSet:
[NSCharacterSet whitespaceCharacterSet]] isEqualToString:qtk_curraudiodevice_uid]) {
msg_Dbg(p_demux, "Device found");
break;
}
......@@ -456,18 +459,17 @@ static int Open(vlc_object_t *p_this)
p_sys->p_es_audio = es_out_Add(p_demux->out, &audiofmt);
[audioInput release];
[pool release];
msg_Dbg(p_demux, "QTSound: We have an audio device ready!");
return VLC_SUCCESS;
error:
error:
[audioInput release];
[pool release];
free(p_sys);
return VLC_EGENERIC;
}
}
/*****************************************************************************
......@@ -475,7 +477,7 @@ error:
*****************************************************************************/
static void Close(vlc_object_t *p_this)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@autoreleasepool {
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
......@@ -484,8 +486,7 @@ static void Close(vlc_object_t *p_this)
[p_sys->session performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
free(p_sys);
[pool release];
}
}
/*****************************************************************************
......@@ -495,10 +496,8 @@ static int Demux(demux_t *p_demux)
{
demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_blocka = nil;
NSAutoreleasePool *pool;
@autoreleasepool {
@synchronized (p_sys->audiooutput) {
if ([p_sys->audiooutput checkCurrentAudioBuffer]) {
unsigned i_buffer_size = [p_sys->audiooutput getCurrentTotalDataSize];
......@@ -516,6 +515,7 @@ static int Demux(demux_t *p_demux)
[p_sys->audiooutput freeAudioMem];
}
}
}
if (p_blocka) {
if (!p_blocka->i_pts) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment