# HG changeset patch # User asheldon # Date 1162669612 28800 # Node ID 852009adbb68bb5701e649965dd8ba6df4cb9ce0 # Parent dc19e2baf7e0d1f166372479b55bca418f27ccc5 [svn] Get rid of compile warnings. Also, note that this is a one-line fix despite appearances. diff -r dc19e2baf7e0 -r 852009adbb68 ChangeLog --- a/ChangeLog Sat Nov 04 11:35:34 2006 -0800 +++ b/ChangeLog Sat Nov 04 11:46:52 2006 -0800 @@ -1,3 +1,11 @@ +2006-11-04 19:35:34 +0000 Aaron Sheldon + revision [426] + Add sap plugin to configure.ac stuff + + trunk/configure.ac | 11 +++++++++++ + 1 file changed, 11 insertions(+) + + 2006-11-04 15:04:02 +0000 Tony Vroon revision [424] Port pthread -> gthread, port audio output to produce_audio, sprinkle debug printfs. Still broken, good luck diff -r dc19e2baf7e0 -r 852009adbb68 src/sap/sap_plug.h --- a/src/sap/sap_plug.h Sat Nov 04 11:35:34 2006 -0800 +++ b/src/sap/sap_plug.h Sat Nov 04 11:46:52 2006 -0800 @@ -1,47 +1,47 @@ -/* - * SAP xmms plug-in. - * Copyright 2002/2003 by Michal 'Mikey' Szwaczko - * - * SAP Library ver. 1.56 by Adam Bienias - * - * This is free software. You can modify it and distribute it under the terms - * of the GNU General Public License. The verbatim text of the license can - * be found in file named COPYING in the source directory. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - */ -#include "saplib/sapLib.h" - -/* Default frequency */ -#define OUTPUT_FREQ 44100 -/* how many samples per one saprender() */ -#define N_RENDER 1024 - -/* functions */ -static int sap_is_our_file (char *); -static void sap_play_file(gchar *); -static void sap_stop(void); -static void sap_pause(short); -static void sap_seek(int); -static int sap_get_time(void); -static void sap_about(void); - -extern void sap_file_info_box(char *); - -static gboolean going; -static gboolean audio_error; -static pthread_t play_thread; - +/* + * SAP xmms plug-in. + * Copyright 2002/2003 by Michal 'Mikey' Szwaczko + * + * SAP Library ver. 1.56 by Adam Bienias + * + * This is free software. You can modify it and distribute it under the terms + * of the GNU General Public License. The verbatim text of the license can + * be found in file named COPYING in the source directory. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ +#include "saplib/sapLib.h" + +/* Default frequency */ +#define OUTPUT_FREQ 44100 +/* how many samples per one saprender() */ +#define N_RENDER 1024 + +/* functions */ +static int sap_is_our_file (char *); +static void sap_play_file(gchar *); +static void sap_stop(void); +static void sap_pause(short); +static void sap_seek(int); +static int sap_get_time(void); +static void sap_about(void); + +extern void sap_file_info_box(char *); + +static gboolean going; +static gboolean audio_error; +static GThread* play_thread; + int currentSong; -static int tunes; - +static int tunes; + sapMUSICstrc *currentFile; - + signed short play_buf[N_RENDER << 2];