Synchronize with trunk

[disorder] / lib / coreaudio.c

diff --git a/lib/coreaudio.c b/lib/coreaudio.c
index f6a8162995837b2a0e763df22b4538793268f16e..aafab8612b6f71209102a900170f971993d5ccbc 100644 (file)
--- a/lib/coreaudio.c
+++ b/lib/coreaudio.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file lib/coreaudio.c
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file lib/coreaudio.c

- * @brief Support for @ref BACKEND_COREAUDIO
+ * @brief Support for Apple Core Audio

  */
 
 #include "common.h"
  */
 
 #include "common.h"


@@ -65,9 +65,9 @@ static AudioDeviceID coreaudio_use_default(void) {
 
 /** @brief Find a device by some string
  * @param selector Selector for property to look for
 
 /** @brief Find a device by some string
  * @param selector Selector for property to look for

- * @param description Property description

  * @param devs List of device IDs
  * @param ndevs Number of device IDs in @p devs
  * @param devs List of device IDs
  * @param ndevs Number of device IDs in @p devs

+ * @param dev Desired device name

  * @param resultp Where to put device ID
  * @return 1 if found, 0 if not found
  */
  * @param resultp Where to put device ID
  * @return 1 if found, 0 if not found
  */


@@ -96,7 +96,7 @@ static int coreaudio_find_device(AudioObjectPropertySelector selector,
                      '?', FALSE, output, sizeof output,
                      &used);
     output[used] = 0;
                      '?', FALSE, output, sizeof output,
                      &used);
     output[used] = 0;

-    info("device %u %s: %s", n, description, (char *)output);
+    disorder_info("device %u %s: %s", n, description, (char *)output);

 #endif
     if(CFStringCompare(dev, name,
                        kCFCompareCaseInsensitive|kCFCompareNonliteral)
 #endif
     if(CFStringCompare(dev, name,
                        kCFCompareCaseInsensitive|kCFCompareNonliteral)