diff options
Diffstat (limited to 'audio/squash')
-rw-r--r-- | audio/squash/files/patch-FIXLOCK-src_global_squash.c | 6 | ||||
-rw-r--r-- | audio/squash/files/patch-include_global.h (renamed from audio/squash/files/patch-include__global.h) | 4 | ||||
-rw-r--r-- | audio/squash/files/patch-include_play__flac.h (renamed from audio/squash/files/patch-include__play_flac.h) | 6 | ||||
-rw-r--r-- | audio/squash/files/patch-src_display.c (renamed from audio/squash/files/patch-src__display.c) | 8 | ||||
-rw-r--r-- | audio/squash/files/patch-src_play__flac.c (renamed from audio/squash/files/patch-src__play_flac.c) | 22 | ||||
-rw-r--r-- | audio/squash/files/patch-src_player.c (renamed from audio/squash/files/patch-src__player.c) | 6 |
6 files changed, 26 insertions, 26 deletions
diff --git a/audio/squash/files/patch-FIXLOCK-src_global_squash.c b/audio/squash/files/patch-FIXLOCK-src_global_squash.c index 0b94b31..a2a9fdb 100644 --- a/audio/squash/files/patch-FIXLOCK-src_global_squash.c +++ b/audio/squash/files/patch-FIXLOCK-src_global_squash.c @@ -1,6 +1,6 @@ ---- ./src/global_squash.c.orig 2003-12-05 21:23:51.000000000 +0100 -+++ ./src/global_squash.c 2011-03-21 17:21:19.000000000 +0100 -@@ -143,7 +143,6 @@ +--- src/global_squash.c.orig 2003-12-05 20:23:51 UTC ++++ src/global_squash.c +@@ -143,7 +143,6 @@ void load_state() { playlist_queue_song( song, state_info.raw_songs[state_info.current_song].position ); } state_info.current_song++; diff --git a/audio/squash/files/patch-include__global.h b/audio/squash/files/patch-include_global.h index 72822f1..70710f9 100644 --- a/audio/squash/files/patch-include__global.h +++ b/audio/squash/files/patch-include_global.h @@ -1,5 +1,5 @@ ---- ./include/global.h.orig 2003-12-18 22:51:43.000000000 +0100 -+++ ./include/global.h 2011-03-21 17:21:19.000000000 +0100 +--- include/global.h.orig 2003-12-18 21:51:43 UTC ++++ include/global.h @@ -57,7 +57,7 @@ #endif #include <math.h> diff --git a/audio/squash/files/patch-include__play_flac.h b/audio/squash/files/patch-include_play__flac.h index c23848f..b193a1b 100644 --- a/audio/squash/files/patch-include__play_flac.h +++ b/audio/squash/files/patch-include_play__flac.h @@ -1,5 +1,5 @@ ---- ./include/play_flac.h.orig 2003-10-12 21:14:33.000000000 +0200 -+++ ./include/play_flac.h 2011-03-21 17:21:19.000000000 +0100 +--- include/play_flac.h.orig 2003-10-12 19:14:33 UTC ++++ include/play_flac.h @@ -32,7 +32,7 @@ * Structures */ @@ -9,7 +9,7 @@ char *buffer; int buffer_size; int channels; -@@ -45,11 +45,11 @@ +@@ -45,11 +45,11 @@ typedef struct flac_data_s { * Prototypes */ void *flac_open( char *filename, sound_format_t *sound_format ); diff --git a/audio/squash/files/patch-src__display.c b/audio/squash/files/patch-src_display.c index eddc376..5e8ddf6 100644 --- a/audio/squash/files/patch-src__display.c +++ b/audio/squash/files/patch-src_display.c @@ -1,6 +1,6 @@ ---- ./src/display.c.orig 2003-12-07 22:20:41.000000000 +0100 -+++ ./src/display.c 2011-03-21 17:21:19.000000000 +0100 -@@ -179,6 +179,22 @@ +--- src/display.c.orig 2003-12-07 21:20:41 UTC ++++ src/display.c +@@ -179,6 +179,22 @@ void *display_monitor( void *input_data return (void *)NULL; } @@ -23,7 +23,7 @@ /* * Draw the screen, This takes into account rebuilding all the * windows in case of screen resize, or if a window changes size. -@@ -1567,7 +1583,7 @@ +@@ -1567,7 +1583,7 @@ void draw_info( void ) { } /* Clip filename */ diff --git a/audio/squash/files/patch-src__play_flac.c b/audio/squash/files/patch-src_play__flac.c index 57fc5d2..b9925d2 100644 --- a/audio/squash/files/patch-src__play_flac.c +++ b/audio/squash/files/patch-src_play__flac.c @@ -1,5 +1,5 @@ ---- ./src/play_flac.c.orig 2003-12-18 18:08:57.000000000 +0100 -+++ ./src/play_flac.c 2011-03-21 17:21:19.000000000 +0100 +--- src/play_flac.c.orig 2003-12-18 17:08:57 UTC ++++ src/play_flac.c @@ -24,7 +24,7 @@ #include "database.h" /* for insert_meta_data */ #include "play_flac.h" @@ -9,7 +9,7 @@ /* errors? we don't need no stinking errors */ return; } -@@ -36,47 +36,26 @@ +@@ -36,47 +36,26 @@ void flac_error_callback(const FLAC__Fil */ void *flac_open( char *filename, sound_format_t *sound_format ) { flac_data_t *flac_data; @@ -63,7 +63,7 @@ break; } -@@ -86,7 +65,7 @@ +@@ -86,7 +65,7 @@ void *flac_open( char *filename, sound_f flac_data->sample_rate = -1; flac_data->duration = -1; @@ -72,7 +72,7 @@ sound_format->rate = flac_data->sample_rate; sound_format->channels = flac_data->channels; -@@ -97,12 +76,12 @@ +@@ -97,12 +76,12 @@ void *flac_open( char *filename, sound_f return (void *)flac_data; } @@ -87,7 +87,7 @@ FLAC__StreamMetadata_VorbisComment comment = metadata->data.vorbis_comment; int i; char *start, *end, *key, *value; -@@ -128,7 +107,7 @@ +@@ -128,7 +107,7 @@ void flac_metadata_callback_load_meta( c } } @@ -96,7 +96,7 @@ flac_data_t *flac_data = (flac_data_t *)client_data; int i, j, k; -@@ -158,7 +137,7 @@ +@@ -158,7 +137,7 @@ FLAC__StreamDecoderWriteStatus flac_writ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; } @@ -105,7 +105,7 @@ flac_data_t *flac_data = (flac_data_t *)client_data; if( metadata->type != FLAC__METADATA_TYPE_STREAMINFO ) { -@@ -172,47 +151,29 @@ +@@ -172,47 +151,29 @@ void flac_metadata_callback_decode_frame } void flac_load_meta( void *data, char *filename ) { @@ -164,7 +164,7 @@ return; } -@@ -223,29 +184,27 @@ +@@ -223,29 +184,27 @@ void flac_load_meta( void *data, char *f frame_data_t flac_decode_frame( void *data ) { flac_data_t *flac_data = (flac_data_t *)data; frame_data_t frame_data; @@ -205,7 +205,7 @@ break; } -@@ -267,7 +226,7 @@ +@@ -267,7 +226,7 @@ long flac_calc_duration( void *data ) { void flac_seek( void *data, long seek_time, long duration ) { flac_data_t *flac_data = (flac_data_t *)data; @@ -214,7 +214,7 @@ return; } -@@ -277,9 +236,9 @@ +@@ -277,9 +236,9 @@ void flac_seek( void *data, long seek_ti void flac_close( void *data ) { flac_data_t *flac_data = (flac_data_t *)data; diff --git a/audio/squash/files/patch-src__player.c b/audio/squash/files/patch-src_player.c index 3251656..5370827 100644 --- a/audio/squash/files/patch-src__player.c +++ b/audio/squash/files/patch-src_player.c @@ -1,6 +1,6 @@ ---- ./src/player.c.orig 2003-12-18 22:53:12.000000000 +0100 -+++ ./src/player.c 2011-03-21 17:21:19.000000000 +0100 -@@ -118,6 +118,7 @@ +--- src/player.c.orig 2003-12-18 21:53:12 UTC ++++ src/player.c +@@ -118,6 +118,7 @@ void *player( void *input_data ) { char *full_filename; long start_position; |