oggdec filter improvements.

[paraslash.git] / osx_write.c

diff --git a/osx_write.c b/osx_write.c
index 8e40dd5b24706233c805af788d0269db65627173..4bdb0ceb9e1ec5c31ac1ea93e64bc2456633f74b 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -19,6 +19,7 @@
 #include "string.h"
 #include "list.h"
 #include "sched.h"
 #include "string.h"
 #include "list.h"
 #include "sched.h"

+#include "ggo.h"

 #include "write.h"
 #include "osx_write.cmdline.h"
 #include "error.h"
 #include "write.h"
 #include "osx_write.cmdline.h"
 #include "error.h"


@@ -126,7 +127,7 @@ static OSStatus osx_callback(void * inClientData,
                dest = outOutputData->mBuffers[i].mData;
                while (m > 0) {
                        if ((n = powd->from->remaining) <= 0) {
                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);
                                return 0;
                        }
 //                     PARA_INFO_LOG("buf %p: n = %ld, m= %ld\n", powd->from->buffer, n, m);


@@ -148,6 +149,12 @@ static OSStatus osx_callback(void * inClientData,
        return 0;
 }
 
        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(
 static int osx_write_open(struct writer_node *wn)
 {
        struct private_osx_write_data *powd = para_calloc(


@@ -195,7 +202,7 @@ static int osx_write_open(struct writer_node *wn)
        /* flags specific to each format */
        format.mFormatFlags = kLinearPCMFormatFlagIsFloat
                | kLinearPCMFormatFlagIsPacked
        /* flags specific to each format */
        format.mFormatFlags = kLinearPCMFormatFlagIsFloat
                | kLinearPCMFormatFlagIsPacked

-               | kLinearPCMFormatFlagIsBigEndian;
+               | ENDIAN_FLAGS;

        if (!conf->channels_given && wng->channels)
                powd->channels = *wng->channels;
        else
        if (!conf->channels_given && wng->channels)
                powd->channels = *wng->channels;
        else


@@ -272,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;
 {
        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;
 
        if (!need_new_buffer(wn))
                return 1;