com_stat(): Return a proper error message if an invalid option was given.

[paraslash.git] / osx_write.c

diff --git a/osx_write.c b/osx_write.c
index 107746c78e83f8f875d640a27114ee0d57eb01fa..4bdb0ceb9e1ec5c31ac1ea93e64bc2456633f74b 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file osx_write.c paraslash's output plugin for MacOs */
@@ -23,12 +11,15 @@
  * <skortze@sourceforge.net>
  */
 
+#include <sys/types.h>
+#include <dirent.h>
 #include <CoreAudio/CoreAudio.h>
 #include "para.h"
 #include "fd.h"
 #include "string.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "write.h"
 #include "osx_write.cmdline.h"
 #include "error.h"
@@ -111,14 +102,8 @@ static void fill_buffer(struct osx_buffer *b, short *source, long size)
                b->size = size;
        }
        dest = b->buffer;
-       while (size--) {
-               char *tmp = (char *)source;
-               char c = *tmp;
-               *tmp = *(tmp + 1);
-               *(tmp + 1) = c;
-               /* *dest++ = ((*source++) + 32768) / 65536.0; */
+       while (size--)
                *dest++ = (*source++) / 32768.0;
-       }
        b->ptr = b->buffer;
        b->remaining = b->size;
 }
@@ -142,7 +127,7 @@ static OSStatus osx_callback(void * inClientData,
                dest = outOutputData->mBuffers[i].mData;
                while (m > 0) {
                        if ((n = powd->from->remaining) <= 0) {
-                               PARA_INFO_LOG("%s", "buffer underrun\n");
+                               PARA_INFO_LOG("buffer underrun\n");
                                return 0;
                        }
 //                     PARA_INFO_LOG("buf %p: n = %ld, m= %ld\n", powd->from->buffer, n, m);
@@ -164,6 +149,12 @@ static OSStatus osx_callback(void * inClientData,
        return 0;
 }
 
+#ifdef WORDS_BIGENDIAN /* ppc */
+#define ENDIAN_FLAGS kLinearPCMFormatFlagIsBigEndian
+#else
+#define ENDIAN_FLAGS 0
+#endif
+
 static int osx_write_open(struct writer_node *wn)
 {
        struct private_osx_write_data *powd = para_calloc(
@@ -211,7 +202,7 @@ static int osx_write_open(struct writer_node *wn)
        /* flags specific to each format */
        format.mFormatFlags = kLinearPCMFormatFlagIsFloat
                | kLinearPCMFormatFlagIsPacked
-               | kLinearPCMFormatFlagIsBigEndian;
+               | ENDIAN_FLAGS;
        if (!conf->channels_given && wng->channels)
                powd->channels = *wng->channels;
        else
@@ -288,7 +279,7 @@ static int osx_write_post_select(__a_unused struct sched *s,
 {
        struct private_osx_write_data *powd = wn->private_data;
        struct writer_node_group *wng = wn->wng;
-       short *data = (short*)wng->buf;
+       short *data = (short*)*wng->bufp;
 
        if (!need_new_buffer(wn))
                return 1;