Changeset 455 for bmp-musepack/trunk/src/libmpc.h

Timestamp:

11/07/09 20:03:01 (15 years ago)

Author:

r2d

Message:

changes for audacious (don't know if it works, old changes)

File:

• bmp-musepack/trunk/src/libmpc.h (modified) (6 diffs)

bmp-musepack/trunk/src/libmpc.h

@@ -2 +2 @@
  * Copyright (c) 2005, The Musepack Development Team
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
- * 
+ *
  *     * Redistributions in binary form must reproduce the above
  *       copyright notice, this list of conditions and the following
  *       disclaimer in the documentation and/or other materials provided
  *       with the distribution.
- * 
+ *
  *     * Neither the name of the The Musepack Development Team nor the
  *       names of its contributors may be used to endorse or promote
  *       products derived from this software without specific prior
  *       written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -39 +39 @@
 extern "C"
 {
-#include <bmp/plugin.h>
-#include <bmp/util.h>
-#include <bmp/configdb.h>
-#include <bmp/titlestring.h>
+#include <audacious/plugin.h>
+#include <audacious/util.h>
+#include <audacious/configdb.h>
+#include <audacious/strings.h>
 }
 
@@ -54 +54 @@
 
 //libmpcdec headers
-#include <mpcdec/mpcdec.h>
+#include <mpc/mpcdec.h>
 
 //GTK+ headers
@@ -160 +160 @@
 static void       lockRelease();
 static void*      decodeStream(void*);
-static int        processBuffer(MPC_SAMPLE_FORMAT*, char*, mpc_decoder&);
+static int        processBuffer(MPC_SAMPLE_FORMAT*, char*, mpc_demux&);
 static void*      endThread(char*, FILE*, bool);
 static bool       isAlive();
@@ -167 +167 @@
 static void       setOffset(double);
 static bool       isPause();
-static void       setReplaygain(mpc_streaminfo&, mpc_decoder&);
+static void       setReplaygain(mpc_demux *);
 
 #ifdef MPC_FIXED_POINT
@@ -186 +186 @@
     int clipMax    = (1 << (pSize - 1)) - 1;
     int floatScale =  1 << (pSize - 1);
-    for (unsigned n = 0; n < 2 * pLength; n++)
+    for (unsigned n = 0; n < pLength; n++)
     {
         int val;