[99166] trunk/dports/audio/mpd
rmstonecipher at macports.org
rmstonecipher at macports.org
Sun Oct 28 16:32:44 PDT 2012
Revision: 99166
http://trac.macports.org//changeset/99166
Author: rmstonecipher at macports.org
Date: 2012-10-28 16:32:44 -0700 (Sun, 28 Oct 2012)
Log Message:
-----------
audio/mpd remove darwin-10-only patch to begin working on ticket #35081
Modified Paths:
--------------
trunk/dports/audio/mpd/Portfile
Removed Paths:
-------------
trunk/dports/audio/mpd/files/patch-src-output-osx_plugin.c
Modified: trunk/dports/audio/mpd/Portfile
===================================================================
--- trunk/dports/audio/mpd/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
+++ trunk/dports/audio/mpd/Portfile 2012-10-28 23:32:44 UTC (rev 99166)
@@ -70,9 +70,6 @@
configure.args-delete --enable-ao
depends_lib-delete port:libao
}
-platform darwin 10 {
- patchfiles-append patch-src-output-osx_plugin.c
-}
if {"darwin" == ${os.platform} && ${os.major} > 8} {
set mpduser _mpd
Deleted: trunk/dports/audio/mpd/files/patch-src-output-osx_plugin.c
===================================================================
--- trunk/dports/audio/mpd/files/patch-src-output-osx_plugin.c 2012-10-28 22:56:03 UTC (rev 99165)
+++ trunk/dports/audio/mpd/files/patch-src-output-osx_plugin.c 2012-10-28 23:32:44 UTC (rev 99166)
@@ -1,73 +0,0 @@
---- src/output/osx_plugin.c.orig 2009-09-11 00:11:55.000000000 -0500
-+++ src/output/osx_plugin.c 2009-09-11 22:02:46.000000000 -0500
-@@ -90,9 +90,9 @@
-
- AudioOutputUnitStop(od->au);
- AudioUnitUninitialize(od->au);
-- CloseComponent(od->au);
-+ AudioComponentInstanceDispose(od->au);
-
- fifo_buffer_free(od->buffer);
- }
-
- static OSStatus
-@@ -157,12 +157,12 @@
- osx_output_open(void *data, struct audio_format *audio_format, GError **error)
- {
- struct osx_output *od = data;
-- ComponentDescription desc;
-- Component comp;
-+ AudioComponentDescription desc;
-+ AudioComponent comp;
- AURenderCallbackStruct callback;
- AudioStreamBasicDescription stream_description;
- OSStatus status;
-- ComponentResult result;
-+ OSStatus result;
-
- if (audio_format->bits > 16)
- audio_format->bits = 16;
-@@ -173,14 +173,14 @@
- desc.componentFlags = 0;
- desc.componentFlagsMask = 0;
-
-- comp = FindNextComponent(NULL, &desc);
-+ comp = AudioComponentFindNext(NULL, &desc);
- if (comp == 0) {
- g_set_error(error, osx_output_quark(), 0,
- "Error finding OS X component");
- return false;
- }
-
-- status = OpenAComponent(comp, &od->au);
-+ status = AudioComponentInstanceNew(comp, &od->au);
- if (status != noErr) {
- g_set_error(error, osx_output_quark(), 0,
- "Unable to open OS X component: %s",
-@@ -190,7 +190,7 @@
-
- status = AudioUnitInitialize(od->au);
- if (status != noErr) {
-- CloseComponent(od->au);
-+ AudioComponentInstanceDispose(od->au);
- g_set_error(error, osx_output_quark(), 0,
- "Unable to initialize OS X audio unit: %s",
- GetMacOSStatusCommentString(status));
-@@ -206,7 +206,7 @@
- &callback, sizeof(callback));
- if (result != noErr) {
- AudioUnitUninitialize(od->au);
-- CloseComponent(od->au);
-+ AudioComponentInstanceDispose(od->au);
- g_set_error(error, osx_output_quark(), 0,
- "unable to set callback for OS X audio unit");
- return false;
-@@ -232,7 +232,7 @@
- sizeof(stream_description));
- if (result != noErr) {
- AudioUnitUninitialize(od->au);
-- CloseComponent(od->au);
-+ AudioComponentInstanceDispose(od->au);
- g_set_error(error, osx_output_quark(), 0,
- "Unable to set format on OS X device");
- return false;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121028/557d60f8/attachment.html>
More information about the macports-changes
mailing list