--- vorbis-tools-1.1.1.orig/debian/patches/upstream_r12201-ogg123_crlf_in_playlists.diff +++ vorbis-tools-1.1.1/debian/patches/upstream_r12201-ogg123_crlf_in_playlists.diff @@ -0,0 +1,18 @@ +Index: vorbis-tools-1.1.1/ogg123/playlist.c +=================================================================== +--- vorbis-tools-1.1.1.orig/ogg123/playlist.c 2007-01-20 10:43:21.164920570 -0500 ++++ vorbis-tools-1.1.1/ogg123/playlist.c 2007-01-20 10:44:27.543868707 -0500 +@@ -202,8 +202,11 @@ + if (i == length) + continue; + +- /* Crop off last \n if present */ +- if (filename[length - 1] == '\n') ++ /* Crop off trailing newlines if present. Handle DOS (\r\n), Unix (\n) ++ * and MacOS<9 (\r) line endings. */ ++ if (filename[length - 2] == '\r' && filename[length - 1] == '\n') ++ filename[length - 2] = '\0'; ++ else if (filename[length - 1] == '\n' || filename[length - 1] == '\r') + filename[length - 1] = '\0'; + + if (stat(filename, &stat_buf) == 0) { --- vorbis-tools-1.1.1.orig/debian/patches/upstream_r10080-fix_non-ascii_comments.diff +++ vorbis-tools-1.1.1/debian/patches/upstream_r10080-fix_non-ascii_comments.diff @@ -0,0 +1,39 @@ +Index: trunk/vorbis-tools/share/charset.c +=================================================================== +--- trunk/vorbis-tools/share/charset.c (revision 2185) ++++ trunk/vorbis-tools/share/charset.c (revision 10080) +@@ -27,4 +27,8 @@ + * 8-bit char, 16-bit short and 32-bit int. + */ ++ ++#ifdef HAVE_CONFIG_H ++# include ++#endif + + #ifndef HAVE_ICONV /* should be ifdef USE_CHARSET_CONVERT */ +Index: trunk/vorbis-tools/share/iconvert.c +=================================================================== +--- trunk/vorbis-tools/share/iconvert.c (revision 3028) ++++ trunk/vorbis-tools/share/iconvert.c (revision 10080) +@@ -16,4 +16,8 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ ++ ++#ifdef HAVE_CONFIG_H ++# include ++#endif + + #ifdef HAVE_ICONV +Index: trunk/vorbis-tools/share/utf8.c +=================================================================== +--- trunk/vorbis-tools/share/utf8.c (revision 3510) ++++ trunk/vorbis-tools/share/utf8.c (revision 10080) +@@ -22,4 +22,8 @@ + */ + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #include + #include --- vorbis-tools-1.1.1.orig/debian/patches/upstream_r11665_r12199_plus_autoconf.diff +++ vorbis-tools-1.1.1/debian/patches/upstream_r11665_r12199_plus_autoconf.diff @@ -0,0 +1,1155 @@ +(NB: Revision 11665 on oggenc/flac.[ch] is needed for r12199 to apply.) +Index: oggenc/flac.c +=================================================================== +--- oggenc/flac.c (revision 11664) ++++ oggenc/flac.c (revision 11665) +@@ -33,263 +33,263 @@ + + int flac_id(unsigned char *buf, int len) + { +- if (len < 4) return 0; ++ if (len < 4) return 0; + +- return memcmp(buf, "fLaC", 4) == 0; ++ return memcmp(buf, "fLaC", 4) == 0; + } + + + int oggflac_id(unsigned char *buf, int len) + { +- if (len < 32) return 0; ++ if (len < 32) return 0; + +- return memcmp(buf, "OggS", 4) == 0 && flac_id(buf+28, len - 28); ++ return memcmp(buf, "OggS", 4) == 0 && flac_id(buf+28, len - 28); + } + + + int flac_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) + { +- flacfile *flac = malloc(sizeof(flacfile)); ++ flacfile *flac = malloc(sizeof(flacfile)); + +- flac->decoder = NULL; +- flac->channels = 0; +- flac->rate = 0; +- flac->totalsamples = 0; +- flac->comments = NULL; +- flac->in = NULL; +- flac->eos = 0; ++ flac->decoder = NULL; ++ flac->channels = 0; ++ flac->rate = 0; ++ flac->totalsamples = 0; ++ flac->comments = NULL; ++ flac->in = NULL; ++ flac->eos = 0; + +- /* Setup empty audio buffer that will be resized on first frame +- callback */ +- flac->buf = NULL; +- flac->buf_len = 0; +- flac->buf_start = 0; +- flac->buf_fill = 0; ++ /* Setup empty audio buffer that will be resized on first frame ++ callback */ ++ flac->buf = NULL; ++ flac->buf_len = 0; ++ flac->buf_start = 0; ++ flac->buf_fill = 0; + +- /* Copy old input data over */ +- flac->oldbuf = malloc(buflen); +- flac->oldbuf_len = buflen; +- memcpy(flac->oldbuf, oldbuf, buflen); +- flac->oldbuf_start = 0; ++ /* Copy old input data over */ ++ flac->oldbuf = malloc(buflen); ++ flac->oldbuf_len = buflen; ++ memcpy(flac->oldbuf, oldbuf, buflen); ++ flac->oldbuf_start = 0; + +- /* Need to save FILE pointer for read callback */ +- flac->in = in; ++ /* Need to save FILE pointer for read callback */ ++ flac->in = in; + +- /* Setup FLAC decoder */ +- flac->decoder = EasyFLAC__stream_decoder_new(oggflac_id(oldbuf, buflen)); +- EasyFLAC__set_client_data(flac->decoder, flac); +- EasyFLAC__set_read_callback(flac->decoder, &easyflac_read_callback); +- EasyFLAC__set_write_callback(flac->decoder, &easyflac_write_callback); +- EasyFLAC__set_metadata_callback(flac->decoder, &easyflac_metadata_callback); +- EasyFLAC__set_error_callback(flac->decoder, &easyflac_error_callback); +- EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO); +- EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); +- EasyFLAC__init(flac->decoder); +- +- /* Callback will set the total samples and sample rate */ +- EasyFLAC__process_until_end_of_metadata(flac->decoder); ++ /* Setup FLAC decoder */ ++ flac->decoder = EasyFLAC__stream_decoder_new(oggflac_id(oldbuf, buflen)); ++ EasyFLAC__set_client_data(flac->decoder, flac); ++ EasyFLAC__set_read_callback(flac->decoder, &easyflac_read_callback); ++ EasyFLAC__set_write_callback(flac->decoder, &easyflac_write_callback); ++ EasyFLAC__set_metadata_callback(flac->decoder, &easyflac_metadata_callback); ++ EasyFLAC__set_error_callback(flac->decoder, &easyflac_error_callback); ++ EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO); ++ EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); ++ EasyFLAC__init(flac->decoder); ++ ++ /* Callback will set the total samples and sample rate */ ++ EasyFLAC__process_until_end_of_metadata(flac->decoder); + +- /* Callback will set the number of channels and resize the +- audio buffer */ +- EasyFLAC__process_single(flac->decoder); +- +- /* Copy format info for caller */ +- opt->rate = flac->rate; +- opt->channels = flac->channels; +- /* flac->total_samples_per_channel was already set by metadata +- callback when metadata was processed. */ +- opt->total_samples_per_channel = flac->totalsamples; +- /* Copy Vorbis-style comments from FLAC file (read in metadata +- callback)*/ +- if (flac->comments != NULL && opt->copy_comments) +- copy_comments(opt->comments, &flac->comments->data.vorbis_comment); +- opt->read_samples = flac_read; +- opt->readdata = (void *)flac; ++ /* Callback will set the number of channels and resize the ++ audio buffer */ ++ EasyFLAC__process_single(flac->decoder); ++ ++ /* Copy format info for caller */ ++ opt->rate = flac->rate; ++ opt->channels = flac->channels; ++ /* flac->total_samples_per_channel was already set by metadata ++ callback when metadata was processed. */ ++ opt->total_samples_per_channel = flac->totalsamples; ++ /* Copy Vorbis-style comments from FLAC file (read in metadata ++ callback)*/ ++ if (flac->comments != NULL && opt->copy_comments) ++ copy_comments(opt->comments, &flac->comments->data.vorbis_comment); ++ opt->read_samples = flac_read; ++ opt->readdata = (void *)flac; + +- return 1; ++ return 1; + } + + + long flac_read(void *in, float **buffer, int samples) + { +- flacfile *flac = (flacfile *)in; +- long realsamples = 0; +- FLAC__bool ret; +- int i,j; +- while (realsamples < samples) +- { +- if (flac->buf_fill > 0) +- { +- int copy = flac->buf_fill < (samples - realsamples) ? +- flac->buf_fill : (samples - realsamples); +- +- for (i = 0; i < flac->channels; i++) +- for (j = 0; j < copy; j++) +- buffer[i][j+realsamples] = +- flac->buf[i][j+flac->buf_start]; +- flac->buf_start += copy; +- flac->buf_fill -= copy; +- realsamples += copy; +- } +- else if (!flac->eos) +- { +- ret = EasyFLAC__process_single(flac->decoder); +- if (!ret || +- EasyFLAC__get_state(flac->decoder) +- == FLAC__STREAM_DECODER_END_OF_STREAM) +- flac->eos = 1; /* Bail out! */ +- } else +- break; +- } ++ flacfile *flac = (flacfile *)in; ++ long realsamples = 0; ++ FLAC__bool ret; ++ int i,j; ++ while (realsamples < samples) ++ { ++ if (flac->buf_fill > 0) ++ { ++ int copy = flac->buf_fill < (samples - realsamples) ? ++ flac->buf_fill : (samples - realsamples); ++ ++ for (i = 0; i < flac->channels; i++) ++ for (j = 0; j < copy; j++) ++ buffer[i][j+realsamples] = ++ flac->buf[i][j+flac->buf_start]; ++ flac->buf_start += copy; ++ flac->buf_fill -= copy; ++ realsamples += copy; ++ } ++ else if (!flac->eos) ++ { ++ ret = EasyFLAC__process_single(flac->decoder); ++ if (!ret || ++ EasyFLAC__get_state(flac->decoder) ++ == FLAC__STREAM_DECODER_END_OF_STREAM) ++ flac->eos = 1; /* Bail out! */ ++ } else ++ break; ++ } + +- return realsamples; ++ return realsamples; + } + + + void flac_close(void *info) + { +- int i; +- flacfile *flac = (flacfile *) info; ++ int i; ++ flacfile *flac = (flacfile *) info; + +- for (i = 0; i < flac->channels; i++) +- free(flac->buf[i]); ++ for (i = 0; i < flac->channels; i++) ++ free(flac->buf[i]); + +- free(flac->buf); +- free(flac->oldbuf); +- free(flac->comments); +- EasyFLAC__finish(flac->decoder); +- EasyFLAC__stream_decoder_delete(flac->decoder); +- free(flac); ++ free(flac->buf); ++ free(flac->oldbuf); ++ free(flac->comments); ++ EasyFLAC__finish(flac->decoder); ++ EasyFLAC__stream_decoder_delete(flac->decoder); ++ free(flac); + } + + + FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) + { +- flacfile *flac = (flacfile *) client_data; +- int i = 0; +- int oldbuf_fill = flac->oldbuf_len - flac->oldbuf_start; +- +- /* Immediately return if errors occured */ +- if(feof(flac->in)) +- { +- *bytes = 0; +- return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM; +- } +- else if(ferror(flac->in)) +- { +- *bytes = 0; +- return FLAC__STREAM_DECODER_READ_STATUS_ABORT; +- } ++ flacfile *flac = (flacfile *) client_data; ++ int i = 0; ++ int oldbuf_fill = flac->oldbuf_len - flac->oldbuf_start; ++ ++ /* Immediately return if errors occured */ ++ if(feof(flac->in)) ++ { ++ *bytes = 0; ++ return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM; ++ } ++ else if(ferror(flac->in)) ++ { ++ *bytes = 0; ++ return FLAC__STREAM_DECODER_READ_STATUS_ABORT; ++ } + + +- if(oldbuf_fill > 0) +- { +- int copy; +- +- copy = oldbuf_fill < (*bytes - i) ? oldbuf_fill : (*bytes - i); +- memcpy(buffer + i, flac->oldbuf, copy); +- i += copy; +- flac->oldbuf_start += copy; +- } +- +- if(i < *bytes) +- i += fread(buffer+i, sizeof(FLAC__byte), *bytes - i, flac->in); ++ if(oldbuf_fill > 0) ++ { ++ int copy; ++ ++ copy = oldbuf_fill < (*bytes - i) ? oldbuf_fill : (*bytes - i); ++ memcpy(buffer + i, flac->oldbuf, copy); ++ i += copy; ++ flac->oldbuf_start += copy; ++ } ++ ++ if(i < *bytes) ++ i += fread(buffer+i, sizeof(FLAC__byte), *bytes - i, flac->in); + +- *bytes = i; +- +- return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; ++ *bytes = i; ++ ++ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; + } + + FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) + { +- flacfile *flac = (flacfile *) client_data; +- int samples = frame->header.blocksize; +- int channels = frame->header.channels; +- int bits_per_sample = frame->header.bits_per_sample; +- int i, j; ++ flacfile *flac = (flacfile *) client_data; ++ int samples = frame->header.blocksize; ++ int channels = frame->header.channels; ++ int bits_per_sample = frame->header.bits_per_sample; ++ int i, j; + +- resize_buffer(flac, channels, samples); ++ resize_buffer(flac, channels, samples); + +- for (i = 0; i < channels; i++) +- for (j = 0; j < samples; j++) +- flac->buf[i][j] = buffer[i][j] / +- (float) (1 << (bits_per_sample - 1)); ++ for (i = 0; i < channels; i++) ++ for (j = 0; j < samples; j++) ++ flac->buf[i][j] = buffer[i][j] / ++ (float) (1 << (bits_per_sample - 1)); + +- flac->buf_start = 0; +- flac->buf_fill = samples; ++ flac->buf_start = 0; ++ flac->buf_fill = samples; + +- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; ++ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; + } + + void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) + { +- flacfile *flac = (flacfile *) client_data; ++ flacfile *flac = (flacfile *) client_data; + +- switch (metadata->type) +- { +- case FLAC__METADATA_TYPE_STREAMINFO: +- flac->totalsamples = metadata->data.stream_info.total_samples; +- flac->rate = metadata->data.stream_info.sample_rate; +- break; ++ switch (metadata->type) ++ { ++ case FLAC__METADATA_TYPE_STREAMINFO: ++ flac->totalsamples = metadata->data.stream_info.total_samples; ++ flac->rate = metadata->data.stream_info.sample_rate; ++ break; + +- case FLAC__METADATA_TYPE_VORBIS_COMMENT: +- flac->comments = FLAC__metadata_object_clone(metadata); +- break; +- default: +- break; +- } ++ case FLAC__METADATA_TYPE_VORBIS_COMMENT: ++ flac->comments = FLAC__metadata_object_clone(metadata); ++ break; ++ default: ++ break; ++ } + } + + void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) + { +- flacfile *flac = (flacfile *) client_data; ++ flacfile *flac = (flacfile *) client_data; + + } + + + void resize_buffer(flacfile *flac, int newchannels, int newsamples) + { +- int i; ++ int i; + +- if (newchannels == flac->channels && newsamples == flac->buf_len) +- { +- flac->buf_start = 0; +- flac->buf_fill = 0; +- return; +- } ++ if (newchannels == flac->channels && newsamples == flac->buf_len) ++ { ++ flac->buf_start = 0; ++ flac->buf_fill = 0; ++ return; ++ } + + +- /* Not the most efficient approach, but it is easy to follow */ +- if(newchannels != flac->channels) +- { +- /* Deallocate all of the sample vectors */ +- for (i = 0; i < flac->channels; i++) +- free(flac->buf[i]); ++ /* Not the most efficient approach, but it is easy to follow */ ++ if(newchannels != flac->channels) ++ { ++ /* Deallocate all of the sample vectors */ ++ for (i = 0; i < flac->channels; i++) ++ free(flac->buf[i]); + +- flac->buf = realloc(flac->buf, sizeof(float*) * newchannels); +- flac->channels = newchannels; ++ flac->buf = realloc(flac->buf, sizeof(float*) * newchannels); ++ flac->channels = newchannels; + +- } ++ } + +- for (i = 0; i < newchannels; i++) +- flac->buf[i] = malloc(sizeof(float) * newsamples); ++ for (i = 0; i < newchannels; i++) ++ flac->buf[i] = malloc(sizeof(float) * newsamples); + +- flac->buf_len = newsamples; +- flac->buf_start = 0; +- flac->buf_fill = 0; ++ flac->buf_len = newsamples; ++ flac->buf_start = 0; ++ flac->buf_fill = 0; + } + + void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments) + { +- int i; ++ int i; + +- for (i = 0; i < f_comments->num_comments; i++) +- { +- char *comment = malloc(f_comments->comments[i].length + 1); +- memset(comment, '\0', f_comments->comments[i].length + 1); +- strncpy(comment, f_comments->comments[i].entry, f_comments->comments[i].length); +- vorbis_comment_add(v_comments, comment); +- free(comment); +- } ++ for (i = 0; i < f_comments->num_comments; i++) ++ { ++ char *comment = malloc(f_comments->comments[i].length + 1); ++ memset(comment, '\0', f_comments->comments[i].length + 1); ++ strncpy(comment, f_comments->comments[i].entry, f_comments->comments[i].length); ++ vorbis_comment_add(v_comments, comment); ++ free(comment); ++ } + } + +Index: oggenc/flac.h +=================================================================== +--- oggenc/flac.h (revision 11664) ++++ oggenc/flac.h (revision 11665) +@@ -8,27 +8,27 @@ + #include "easyflac.h" + + typedef struct { +- EasyFLAC__StreamDecoder *decoder; +- short channels; +- int rate; +- long totalsamples; /* per channel, of course */ ++ EasyFLAC__StreamDecoder *decoder; ++ short channels; ++ int rate; ++ long totalsamples; /* per channel, of course */ + +- FLAC__StreamMetadata *comments; ++ FLAC__StreamMetadata *comments; + +- FILE *in; /* Cache the FILE pointer so the FLAC read callback can use it */ +- int eos; /* End of stream read */ ++ FILE *in; /* Cache the FILE pointer so the FLAC read callback can use it */ ++ int eos; /* End of stream read */ + + +- /* Buffer for decoded audio */ +- float **buf; /* channels by buf_len array */ +- int buf_len; +- int buf_start; /* Offset to start of audio data */ +- int buf_fill; /* Number of bytes of audio data in buffer */ ++ /* Buffer for decoded audio */ ++ float **buf; /* channels by buf_len array */ ++ int buf_len; ++ int buf_start; /* Offset to start of audio data */ ++ int buf_fill; /* Number of bytes of audio data in buffer */ + +- /* Buffer for input data we already read in the id phase */ +- unsigned char *oldbuf; +- int oldbuf_len; +- int oldbuf_start; ++ /* Buffer for input data we already read in the id phase */ ++ unsigned char *oldbuf; ++ int oldbuf_len; ++ int oldbuf_start; + } flacfile; + + +Index: ogg123/flac_format.c +=================================================================== +--- ogg123/flac_format.c (revision 12198) ++++ ogg123/flac_format.c (revision 12199) +@@ -24,18 +24,26 @@ + #include + #include + #include +-#include ++#include + #include + #include "audio.h" + #include "format.h" + #include "i18n.h" ++#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8) ++#define NEED_EASYFLAC 1 ++#endif ++#if NEED_EASYFLAC + #include "easyflac.h" ++#endif + #include "vorbis_comments.h" + +-#define DEFAULT_FLAC_FRAME_SIZE 4608 +- + typedef struct { ++#if NEED_EASYFLAC + EasyFLAC__StreamDecoder *decoder; ++#else ++ FLAC__StreamDecoder *decoder; ++ int is_oggflac; ++#endif + short channels; + int rate; + int bits_per_sample; +@@ -71,10 +79,18 @@ + + + /* Private functions declarations */ +-FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); +-FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); +-void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); +-void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++#if NEED_EASYFLAC ++static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); ++static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); ++static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); ++static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++#else ++static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data); ++static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); ++static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); ++static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data); ++#endif + + void resize_buffer(flac_private_t *flac, int newchannels, int newsamples); + /*void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);*/ +@@ -170,6 +186,7 @@ + private->buf_start = 0; + + /* Setup FLAC decoder */ ++#if NEED_EASYFLAC + if (oggflac_can_decode(source)) { + decoder->format = &oggflac_format; + private->decoder = EasyFLAC__stream_decoder_new(1); +@@ -187,13 +204,40 @@ + EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO); + EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); + EasyFLAC__init(private->decoder); ++#else ++ if (oggflac_can_decode(source)) { ++ private->is_oggflac = 1; ++ decoder->format = &oggflac_format; ++ } else { ++ private->is_oggflac = 0; ++ decoder->format = &flac_format; ++ } ++ private->decoder = FLAC__stream_decoder_new(); ++ ++ FLAC__stream_decoder_set_md5_checking(private->decoder, false); ++ FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO); ++ FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); ++ /*FLAC__stream_decoder_init(private->decoder);*/ ++ if(private->is_oggflac) ++ FLAC__stream_decoder_init_ogg_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder); ++ else ++ FLAC__stream_decoder_init_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder); ++#endif + + /* Callback will set the total samples and sample rate */ ++#if NEED_EASYFLAC + EasyFLAC__process_until_end_of_metadata(private->decoder); ++#else ++ FLAC__stream_decoder_process_until_end_of_metadata(private->decoder); ++#endif + + /* Callback will set the number of channels and resize the + audio buffer */ ++#if NEED_EASYFLAC + EasyFLAC__process_single(private->decoder); ++#else ++ FLAC__stream_decoder_process_single(private->decoder); ++#endif + + /* FLAC API returns signed samples on all streams */ + decoder->actual_fmt.signed_sample = 1; +@@ -256,11 +300,19 @@ + realsamples += copy; + } + else if (!priv->eos) { ++#if NEED_EASYFLAC + ret = EasyFLAC__process_single(priv->decoder); + if (!ret || + EasyFLAC__get_state(priv->decoder) + == FLAC__STREAM_DECODER_END_OF_STREAM) + priv->eos = 1; /* Bail out! */ ++#else ++ ret = FLAC__stream_decoder_process_single(priv->decoder); ++ if (!ret || ++ FLAC__stream_decoder_get_state(priv->decoder) ++ == FLAC__STREAM_DECODER_END_OF_STREAM) ++ priv->eos = 1; /* Bail out! */ ++#endif + } else + break; + } +@@ -326,8 +378,13 @@ + free(priv->buf[i]); + + free(priv->buf); ++#if NEED_EASYFLAC + EasyFLAC__finish(priv->decoder); + EasyFLAC__stream_decoder_delete(priv->decoder); ++#else ++ FLAC__stream_decoder_finish(priv->decoder); ++ FLAC__stream_decoder_delete(priv->decoder); ++#endif + + free(decoder->private); + free(decoder); +@@ -357,7 +414,11 @@ + + + ++#if NEED_EASYFLAC + FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) ++#else ++FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) ++#endif + { + decoder_t *e_decoder = client_data; + flac_private_t *priv = e_decoder->private; +@@ -378,7 +439,11 @@ + } + + ++#if NEED_EASYFLAC + FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) ++#else ++FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) ++#endif + { + decoder_t *e_decoder = client_data; + flac_private_t *priv = e_decoder->private; +@@ -404,7 +469,11 @@ + } + + ++#if NEED_EASYFLAC + void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ++#else ++void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ++#endif + { + decoder_t *e_decoder = client_data; + flac_private_t *priv = e_decoder->private; +@@ -424,13 +493,27 @@ + } + + ++#if NEED_EASYFLAC + void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ++#else ++void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ++#endif + { + + + } + ++#if !NEED_EASYFLAC ++FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data) ++{ ++ decoder_t *e_decoder = client_data; ++ flac_private_t *priv = e_decoder->private; + ++ return priv->eos; ++} ++#endif ++ ++ + void resize_buffer(flac_private_t *flac, int newchannels, int newsamples) + { + int i; +@@ -472,7 +555,11 @@ + + + ++#if NEED_EASYFLAC + if (EasyFLAC__is_oggflac(priv->decoder)) ++#else ++ if (priv->is_oggflac) ++#endif + cb->printf_metadata(decoder->callback_arg, 2, + _("Ogg FLAC stream: %d bits, %d channel, %ld Hz"), + priv->bits_per_sample, +Index: ogg123/easyflac.c +=================================================================== +--- ogg123/easyflac.c (revision 12198) ++++ ogg123/easyflac.c (revision 12199) +@@ -37,10 +37,12 @@ + #include + #endif + ++#include ++#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8) ++ + #include + #include "easyflac.h" + +- + FLAC__bool EasyFLAC__is_oggflac(EasyFLAC__StreamDecoder *decoder) + { + return decoder->is_oggflac; +@@ -377,3 +379,5 @@ + else + return FLAC__stream_decoder_process_until_end_of_stream(decoder->flac); + } ++ ++#endif +Index: oggenc/flac.c +=================================================================== +--- oggenc/flac.c (revision 12198) ++++ oggenc/flac.c (revision 12199) +@@ -23,15 +23,25 @@ + #include "platform.h" + #include "resample.h" + +-#define DEFAULT_FLAC_FRAME_SIZE 4608 ++#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8) ++#define NEED_EASYFLAC 1 ++#endif + +-FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); +-FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); +-void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); +-void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++#if NEED_EASYFLAC ++static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); ++static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); ++static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); ++static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++#else ++static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data); ++static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); ++static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); ++static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data); ++#endif + +-void resize_buffer(flacfile *flac, int newchannels, int newsamples); +-void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments); ++static void resize_buffer(flacfile *flac, int newchannels, int newsamples); ++static void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments); + + + int flac_id(unsigned char *buf, int len) +@@ -81,6 +90,7 @@ + flac->in = in; + + /* Setup FLAC decoder */ ++#if NEED_EASYFLAC + flac->decoder = EasyFLAC__stream_decoder_new(oggflac_id(oldbuf, buflen)); + EasyFLAC__set_client_data(flac->decoder, flac); + EasyFLAC__set_read_callback(flac->decoder, &easyflac_read_callback); +@@ -90,14 +100,32 @@ + EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO); + EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); + EasyFLAC__init(flac->decoder); ++#else ++ flac->decoder = FLAC__stream_decoder_new(); ++ FLAC__stream_decoder_set_md5_checking(flac->decoder, false); ++ FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO); ++ FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); ++ if(oggflac_id(oldbuf, buflen)) ++ FLAC__stream_decoder_init_ogg_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac); ++ else ++ FLAC__stream_decoder_init_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac); ++#endif + + /* Callback will set the total samples and sample rate */ ++#if NEED_EASYFLAC + EasyFLAC__process_until_end_of_metadata(flac->decoder); ++#else ++ FLAC__stream_decoder_process_until_end_of_metadata(flac->decoder); ++#endif + + /* Callback will set the number of channels and resize the + audio buffer */ ++#if NEED_EASYFLAC + EasyFLAC__process_single(flac->decoder); +- ++#else ++ FLAC__stream_decoder_process_single(flac->decoder); ++#endif ++ + /* Copy format info for caller */ + opt->rate = flac->rate; + opt->channels = flac->channels; +@@ -138,11 +166,19 @@ + } + else if (!flac->eos) + { ++#if NEED_EASYFLAC + ret = EasyFLAC__process_single(flac->decoder); + if (!ret || + EasyFLAC__get_state(flac->decoder) + == FLAC__STREAM_DECODER_END_OF_STREAM) + flac->eos = 1; /* Bail out! */ ++#else ++ ret = FLAC__stream_decoder_process_single(flac->decoder); ++ if (!ret || ++ FLAC__stream_decoder_get_state(flac->decoder) ++ == FLAC__STREAM_DECODER_END_OF_STREAM) ++ flac->eos = 1; /* Bail out! */ ++#endif + } else + break; + } +@@ -150,7 +186,6 @@ + return realsamples; + } + +- + void flac_close(void *info) + { + int i; +@@ -162,13 +197,21 @@ + free(flac->buf); + free(flac->oldbuf); + free(flac->comments); ++#if NEED_EASYFLAC + EasyFLAC__finish(flac->decoder); + EasyFLAC__stream_decoder_delete(flac->decoder); ++#else ++ FLAC__stream_decoder_finish(flac->decoder); ++ FLAC__stream_decoder_delete(flac->decoder); ++#endif + free(flac); + } + +- ++#if NEED_EASYFLAC + FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) ++#else ++FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) ++#endif + { + flacfile *flac = (flacfile *) client_data; + int i = 0; +@@ -205,7 +248,11 @@ + return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; + } + ++#if NEED_EASYFLAC + FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) ++#else ++FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) ++#endif + { + flacfile *flac = (flacfile *) client_data; + int samples = frame->header.blocksize; +@@ -226,7 +273,11 @@ + return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; + } + ++#if NEED_EASYFLAC + void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ++#else ++void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ++#endif + { + flacfile *flac = (flacfile *) client_data; + +@@ -245,13 +296,25 @@ + } + } + ++#if NEED_EASYFLAC + void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ++#else ++void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ++#endif + { + flacfile *flac = (flacfile *) client_data; + + } + ++#if !NEED_EASYFLAC ++FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data) ++{ ++ flacfile *flac = (flacfile *) client_data; + ++ return feof(flac->in)? true : false; ++} ++#endif ++ + void resize_buffer(flacfile *flac, int newchannels, int newsamples) + { + int i; +@@ -297,4 +360,3 @@ + free(comment); + } + } +- +Index: oggenc/easyflac.c +=================================================================== +--- oggenc/easyflac.c (revision 12198) ++++ oggenc/easyflac.c (revision 12199) +@@ -37,6 +37,9 @@ + #include + #endif + ++#include ++#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8) ++ + #include + #include "easyflac.h" + +@@ -377,3 +380,5 @@ + else + return FLAC__stream_decoder_process_until_end_of_stream(decoder->flac); + } ++ ++#endif +Index: oggenc/flac.h +=================================================================== +--- oggenc/flac.h (revision 12198) ++++ oggenc/flac.h (revision 12199) +@@ -5,10 +5,21 @@ + #include "encode.h" + #include "audio.h" + #include ++#include ++#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8) ++#define NEED_EASYFLAC 1 ++#endif ++#if NEED_EASYFLAC ++#include + #include "easyflac.h" ++#endif + + typedef struct { ++#if NEED_EASYFLAC + EasyFLAC__StreamDecoder *decoder; ++#else ++ FLAC__StreamDecoder *decoder; ++#endif + short channels; + int rate; + long totalsamples; /* per channel, of course */ +Index: configure.ac +=================================================================== +--- configure.ac (revision 12198) ++++ configure.ac (revision 12199) +@@ -173,17 +173,33 @@ + + FLAC_LIBS="" + if test "x$build_flac" = xyes; then ++ + AC_CHECK_LIB(m,log,FLAC_LIBS="-lm") +- AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single], +- [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"], +- AC_MSG_WARN([libFLAC missing]) +- have_libFLAC=no, [$FLAC_LIBS] +- ) +- AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new], +- [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"], +- AC_MSG_WARN([libOggFLAC missing]) +- have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS] +- ) ++ ++ dnl First check for libFLAC-1.1.3 or later. As of libFLAC 1.1.3, ++ dnl OggFLAC functionality has been rolled into libFLAC rather ++ dnl than being in a separate libOggFLAC library. ++ ++ AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_init_ogg_stream], ++ have_libFLAC=yes, have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS]) ++ ++ if test "x$have_libFLAC" = xyes; then ++ FLAC_LIBS="-lFLAC $FLAC_LIBS $OGG_LIBS" ++ else ++ dnl Check for libFLAC prior to 1.1.3 ++ AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single], ++ [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"], ++ AC_MSG_WARN([libFLAC missing]) ++ have_libFLAC=no, [$FLAC_LIBS] ++ ) ++ ++ AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new], ++ [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"], ++ AC_MSG_WARN([libOggFLAC missing]) ++ have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS] ++ ) ++ fi ++ + AC_CHECK_HEADER(FLAC/stream_decoder.h,, + AC_MSG_WARN(libFLAC headers missing) + have_libFLAC=no,[ ]) +--- configure~ ++++ configure +@@ -27382,6 +27382,7 @@ + + FLAC_LIBS="" + if test "x$build_flac" = xyes; then ++ + echo "$as_me:$LINENO: checking for log in -lm" >&5 + echo $ECHO_N "checking for log in -lm... $ECHO_C" >&6 + if test "${ac_cv_lib_m_log+set}" = set; then +@@ -27449,14 +27450,89 @@ + FLAC_LIBS="-lm" + fi + +- echo "$as_me:$LINENO: checking for FLAC__stream_decoder_process_single in -lFLAC" >&5 ++ ++ ++ echo "$as_me:$LINENO: checking for FLAC__stream_decoder_init_ogg_stream in -lFLAC" >&5 ++echo $ECHO_N "checking for FLAC__stream_decoder_init_ogg_stream in -lFLAC... $ECHO_C" >&6 ++if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_init_ogg_stream+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lFLAC $FLAC_LIBS $OGG_LIBS $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char FLAC__stream_decoder_init_ogg_stream (); ++int ++main () ++{ ++FLAC__stream_decoder_init_ogg_stream (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_FLAC_FLAC__stream_decoder_init_ogg_stream=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_FLAC_FLAC__stream_decoder_init_ogg_stream=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_init_ogg_stream" >&5 ++echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_init_ogg_stream" >&6 ++if test $ac_cv_lib_FLAC_FLAC__stream_decoder_init_ogg_stream = yes; then ++ have_libFLAC=yes ++else ++ have_libFLAC=no ++fi ++ ++ ++ if test "x$have_libFLAC" = xyes; then ++ FLAC_LIBS="-lFLAC $FLAC_LIBS $OGG_LIBS" ++ else ++ echo "$as_me:$LINENO: checking for FLAC__stream_decoder_process_single in -lFLAC" >&5 + echo $ECHO_N "checking for FLAC__stream_decoder_process_single in -lFLAC... $ECHO_C" >&6 + if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_process_single+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lFLAC $FLAC_LIBS +- $LIBS" ++ $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27518,17 +27594,18 @@ + else + { echo "$as_me:$LINENO: WARNING: libFLAC missing" >&5 + echo "$as_me: WARNING: libFLAC missing" >&2;} +- have_libFLAC=no ++ have_libFLAC=no + fi + +- echo "$as_me:$LINENO: checking for OggFLAC__stream_decoder_new in -lOggFLAC" >&5 ++ ++ echo "$as_me:$LINENO: checking for OggFLAC__stream_decoder_new in -lOggFLAC" >&5 + echo $ECHO_N "checking for OggFLAC__stream_decoder_new in -lOggFLAC... $ECHO_C" >&6 + if test "${ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS +- $LIBS" ++ $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27590,9 +27667,11 @@ + else + { echo "$as_me:$LINENO: WARNING: libOggFLAC missing" >&5 + echo "$as_me: WARNING: libOggFLAC missing" >&2;} +- have_libFLAC=no ++ have_libFLAC=no + fi + ++ fi ++ + echo "$as_me:$LINENO: checking for FLAC/stream_decoder.h" >&5 + echo $ECHO_N "checking for FLAC/stream_decoder.h... $ECHO_C" >&6 + if test "${ac_cv_header_FLAC_stream_decoder_h+set}" = set; then --- vorbis-tools-1.1.1.orig/debian/patches/for_upstream-mention_option_-R_in_vorbiscomment.1.diff +++ vorbis-tools-1.1.1/debian/patches/for_upstream-mention_option_-R_in_vorbiscomment.1.diff @@ -0,0 +1,12 @@ +Closes: #252531. +--- a/vorbiscomment/vorbiscomment.1 ++++ b/vorbiscomment/vorbiscomment.1 +@@ -44,6 +44,8 @@ + Specify a new tag on the command line. Each tag is given as a single string. The part before the '=' is treated as the tag name and the part after as the value. + .IP "-w" + Replace comments with the new set given either on the command line with -t or from a file with -c. ++.IP "-R" ++Read and write comments in utf8, rather than converting to the user's character set. + + .\" Examples go here + .SH EXAMPLES --- vorbis-tools-1.1.1.orig/debian/patches/for_upstream-manpage_typos.diff +++ vorbis-tools-1.1.1/debian/patches/for_upstream-manpage_typos.diff @@ -0,0 +1,73 @@ +* Typos in manpages: Closes: #302150. +--- vorbiscomment/vorbiscomment.1.orig ++++ vorbiscomment/vorbiscomment.1 +@@ -57,7 +57,7 @@ + To edit those comments: + + vorbiscomment -l file.ogg > file.txt +- [edit the comments in file.txt to your statisfaction] ++ [edit the comments in file.txt to your satisfaction] + vorbiscomment -w -c file.txt file.ogg newfile.ogg + + To simply add a comment: +--- oggenc/man/oggenc.1.orig ++++ oggenc/man/oggenc.1 +@@ -247,7 +247,7 @@ + set closer to 0, the bitrate manager attempts to hoard bits for future + use in sudden bitrate increases (biasing toward better transient + reproduction). When set closer to 1, the bitrate manager neglects +-transients in favor using bits for homogenous passages. In the ++transients in favor using bits for homogeneous passages. In the + middle, the manager uses a balanced approach. The default setting is \.2, + thus biasing slightly toward transient reproduction. + +@@ -293,25 +293,25 @@ + + Specifying a high-quality encoding averaging 256 kbps (but still VBR). + .RS +-oggenc infile.wav -b 256 out.ogg ++oggenc infile.wav -b 256 -o out.ogg + .RE + .PP + + Specifying a maximum and average bitrate, and enforcing these. + .RS +-oggenc infile.wav --managed -b 128 -M 160 out.ogg ++oggenc infile.wav --managed -b 128 -M 160 -o out.ogg + .RE + .PP + + Specifying quality rather than bitrate (to a very high quality mode) + .RS +-oggenc infile.wav -q 6 out.ogg ++oggenc infile.wav -q 6 -o out.ogg + .RE + .PP + + Downsampling and downmixing to 11 kHz mono before encoding. + .RS +-oggenc --resample 11025 --downmix infile.wav -q 1 out.ogg ++oggenc --resample 11025 --downmix infile.wav -q 1 -o out.ogg + .RE + .PP + +@@ -319,7 +319,7 @@ + .RS + oggenc somefile.wav -t "The track title" -a "artist who performed this" -l + "name of album" -c +-"OTHERFIELD=contents of some other field not explictly supported" ++"OTHERFIELD=contents of some other field not explicitly supported" + .RE + .PP + +--- ogg123/ogg123.1.orig ++++ ogg123/ogg123.1 +@@ -254,7 +254,7 @@ + .RE + .PP + +-Stress test your harddrive: ++Stress test your hard drive: + .RS + .B ogg123 -d oss -d wav -f 1.wav -d wav -f 2.wav -d wav -f 3.wav -d wav -f 4.wav -d wav -f 5.wav test.ogg + .RE --- vorbis-tools-1.1.1.orig/debian/patches/upstream_r12189-ogg123_2hr_intermittentnoise.diff +++ vorbis-tools-1.1.1/debian/patches/upstream_r12189-ogg123_2hr_intermittentnoise.diff @@ -0,0 +1,28 @@ +Index: vorbis-tools-1.1.1/ogg123/buffer.c +=================================================================== +--- vorbis-tools-1.1.1.orig/ogg123/buffer.c 2007-01-18 15:25:22.584863946 -0500 ++++ vorbis-tools-1.1.1/ogg123/buffer.c 2007-01-18 15:26:26.092008708 -0500 +@@ -165,7 +165,7 @@ + + int compute_dequeue_size (buf_t *buf, int request_size) + { +- int next_action_pos; ++ ogg_int64_t next_action_pos; + + /* + For simplicity, the number of bytes played must satisfy the following +@@ -180,10 +180,11 @@ + + next_action_pos = buf->actions->position; + +- return MIN4(buf->curfill, request_size, +- buf->size - buf->start, next_action_pos - buf->position); ++ return MIN4((ogg_int64_t)buf->curfill, (ogg_int64_t)request_size, ++ (ogg_int64_t)(buf->size - buf->start), ++ next_action_pos - buf->position); + } else +- return MIN3(buf->curfill, request_size, buf->size - buf->start); ++ return MIN3(buf->curfill, (long)request_size, buf->size - buf->start); + + } + --- vorbis-tools-1.1.1.orig/debian/patches/for_upstream-ogg123_flac_divbyzero.diff +++ vorbis-tools-1.1.1/debian/patches/for_upstream-ogg123_flac_divbyzero.diff @@ -0,0 +1,16 @@ +Index: vorbis-tools-1.1.1/ogg123/flac_format.c +=================================================================== +--- vorbis-tools-1.1.1.orig/ogg123/flac_format.c 2007-01-17 11:23:16.246447565 -0500 ++++ vorbis-tools-1.1.1/ogg123/flac_format.c 2007-01-17 11:23:29.768731128 -0500 +@@ -215,6 +215,11 @@ + + *audio_fmt = decoder->actual_fmt; + ++ /* Validate channels and word_size to avoid div by zero */ ++ if(!(audio_fmt->channels && audio_fmt->word_size)) { ++ fprintf(stderr, _("Error: Corrupt input.\n")); ++ exit(1); ++ } + + /* Only return whole samples (no channel splitting) */ + samples = nbytes / (audio_fmt->channels * audio_fmt->word_size); --- vorbis-tools-1.1.1.orig/debian/patches/for_upstream-oggenc_inputfile_vs_input.wav.diff +++ vorbis-tools-1.1.1/debian/patches/for_upstream-oggenc_inputfile_vs_input.wav.diff @@ -0,0 +1,13 @@ +* Change input.wav with inputfile, since we accept flac-formated files. + Closes: #262509. +--- vorbis-tools-1.1.1.orig/oggenc/oggenc.c ++++ vorbis-tools-1.1.1/oggenc/oggenc.c +@@ -379,7 +379,7 @@ + { + fprintf(stdout, + _("%s%s\n" +- "Usage: oggenc [options] input.wav [...]\n" ++ "Usage: oggenc [options] inputfile [...]\n" + "\n" + "OPTIONS:\n" + " General:\n" --- vorbis-tools-1.1.1.orig/debian/patches/for_upstream-encodage_vs_codage_in_fr.po.diff +++ vorbis-tools-1.1.1/debian/patches/for_upstream-encodage_vs_codage_in_fr.po.diff @@ -0,0 +1,56 @@ +--- vorbis-tools-1.1.1.orig/po/fr.po ++++ vorbis-tools-1.1.1/po/fr.po +@@ -771,7 +771,7 @@ + #: oggenc/encode.c:391 + #, fuzzy, c-format + msgid "\tEncoding [%2dm%.2ds so far] %c " +-msgstr "\tEncodage [%2dm%.2ds pour l'instant] %c" ++msgstr "\tCodage [%2dm%.2ds pour l'instant] %c" + + #: oggenc/encode.c:409 + #, c-format +@@ -830,7 +830,7 @@ + " %s%s%s \n" + "at average bitrate %d kbps " + msgstr "" +-"Encodage de %s%s%s \n" ++"Codage de %s%s%s \n" + " en %s%s%s \n" + "au débit moyen de %d kbps " + +@@ -851,7 +851,7 @@ + " %s%s%s \n" + "at approximate bitrate %d kbps (VBR encoding enabled)\n" + msgstr "" +-"Encodage de %s%s%s \n" ++"Codage de %s%s%s \n" + " en %s%s%s \n" + "au débit approximatif de %d kbps (encodage VBR en cours)\n" + +@@ -862,7 +862,7 @@ + " %s%s%s \n" + "at quality level %2.2f using constrained VBR " + msgstr "" +-"Encodage de %s%s%s \n" ++"Codage de %s%s%s \n" + " en %s%s%s \n" + "au niveau de qualité %2.2f en utilisant un VBR contraint " + +@@ -873,7 +873,7 @@ + " %s%s%s \n" + "at quality %2.2f\n" + msgstr "" +-"Encodage de %s%s%s \n" ++"Codage de %s%s%s \n" + " en %s%s%s \n" + "ŕ la qualité %2.2f\n" + +@@ -884,7 +884,7 @@ + " %s%s%s \n" + "using bitrate management " + msgstr "" +-"Encodage de %s%s%s \n" ++"Codage de %s%s%s \n" + " en %s%s%s \n" + "en utilisant la gestion du débit " + --- vorbis-tools-1.1.1.orig/debian/patches/upstream_r9696-play_from_pipe.diff +++ vorbis-tools-1.1.1/debian/patches/upstream_r9696-play_from_pipe.diff @@ -0,0 +1,48 @@ +Index: trunk/vorbis-tools/ogg123/file_transport.c +=================================================================== +--- trunk/vorbis-tools/ogg123/file_transport.c (revision 2983) ++++ trunk/vorbis-tools/ogg123/file_transport.c (revision 9696) +@@ -27,4 +27,5 @@ + FILE *fp; + data_source_stats_t stats; ++ int seekable; + } file_private_t; + +@@ -52,4 +53,5 @@ + source->private = private; + ++ private->seekable = 1; + private->stats.transfer_rate = 0; + private->stats.bytes_read = 0; +@@ -61,7 +63,8 @@ + + /* Open file */ +- if (strcmp(source_string, "-") == 0) ++ if (strcmp(source_string, "-") == 0) { + private->fp = stdin; +- else ++ private->seekable = 0; ++ } else + private->fp = fopen(source_string, "r"); + +@@ -84,4 +87,6 @@ + int items; + long start; ++ ++ if (!private->seekable) return 0; + + /* Record where we are */ +@@ -119,4 +124,6 @@ + FILE *fp = private->fp; + ++ if (!private->seekable) return -1; ++ + return fseek(fp, offset, whence); + } +@@ -135,4 +142,6 @@ + file_private_t *private = source->private; + FILE *fp = private->fp; ++ ++ if (!private->seekable) return -1; + + return ftell(fp); --- vorbis-tools-1.1.1.orig/debian/patches/upstream_r10091-ogg123_return_error.diff +++ vorbis-tools-1.1.1/debian/patches/upstream_r10091-ogg123_return_error.diff @@ -0,0 +1,61 @@ +Index: vorbis-tools-1.1.1/ogg123/ogg123.c +=================================================================== +--- vorbis-tools-1.1.1.orig/ogg123/ogg123.c 2005-06-03 06:15:09.000000000 -0400 ++++ vorbis-tools-1.1.1/ogg123/ogg123.c 2006-03-26 21:11:27.258936569 -0500 +@@ -46,6 +46,7 @@ + #include "ogg123.h" + #include "i18n.h" + ++extern int exit_status; /* from status.c */ + + void exit_cleanup (); + void play (char *source_string); +@@ -396,10 +397,9 @@ + + playlist_array_destroy(playlist_array, items); + +- exit (0); ++ exit (exit_status); + } + +- + void play (char *source_string) + { + transport_t *transport; +@@ -615,7 +615,7 @@ + status_message(1, _("Done.")); + + if (sig_request.exit) +- exit (0); ++ exit (exit_status); + } + + +Index: vorbis-tools-1.1.1/ogg123/status.c +=================================================================== +--- vorbis-tools-1.1.1.orig/ogg123/status.c 2005-06-03 06:15:09.000000000 -0400 ++++ vorbis-tools-1.1.1/ogg123/status.c 2006-03-26 21:11:27.262936964 -0500 +@@ -25,6 +25,7 @@ + char temp_buffer[200]; + int last_line_len = 0; + int max_verbosity = 0; ++int exit_status = EXIT_SUCCESS; + + pthread_mutex_t output_lock = PTHREAD_MUTEX_INITIALIZER; + +@@ -449,6 +450,8 @@ + pthread_mutex_unlock(&output_lock); + + pthread_cleanup_pop(0); ++ ++ exit_status = EXIT_FAILURE; + } + + +@@ -462,4 +465,6 @@ + pthread_mutex_unlock(&output_lock); + + pthread_cleanup_pop(0); ++ ++ exit_status = EXIT_FAILURE; + } --- vorbis-tools-1.1.1.orig/debian/patches/no_fast-math.diff +++ vorbis-tools-1.1.1/debian/patches/no_fast-math.diff @@ -0,0 +1,26 @@ +--- a/configure ++++ b/configure +@@ -25130,8 +25130,8 @@ + case $host in + *-*-linux*) + DEBUG="-g -Wall -fsigned-char" +- CFLAGS="-O20 -ffast-math -fsigned-char" +- PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char" ++ CFLAGS="-fsigned-char" ++ PROFILE="-Wall -W -pg -g -fsigned-char" + ;; + sparc-sun-*) + DEBUG="-g -Wall -fsigned-char -mv8" +--- a/configure.ac ++++ b/configure.ac +@@ -59,8 +59,8 @@ + case $host in + *-*-linux*) + DEBUG="-g -Wall -fsigned-char" +- CFLAGS="-O20 -ffast-math -fsigned-char" +- PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char" ++ CFLAGS="-fsigned-char" ++ PROFILE="-Wall -W -pg -g -fsigned-char" + ;; + sparc-sun-*) + DEBUG="-g -Wall -fsigned-char -mv8" --- vorbis-tools-1.1.1.orig/debian/patches/for_upstream-mention_alsa09_in_ogg123.1.diff +++ vorbis-tools-1.1.1/debian/patches/for_upstream-mention_alsa09_in_ogg123.1.diff @@ -0,0 +1,13 @@ +* Modified alsa to mention alsa09 (although the device might be nowadays + alsa, back, since alsa1.0 has been already released). (Closes: #258286) +--- a/ogg123/ogg123.1 ++++ b/ogg123/ogg123.1 +@@ -144,7 +144,7 @@ + .RE + .RE + +-.IP alsa ++.IP alsa09 + Advanced Linux Sound Architecture. + .RS + Options: --- vorbis-tools-1.1.1.orig/debian/patches/series +++ vorbis-tools-1.1.1/debian/patches/series @@ -0,0 +1,16 @@ +upstream_r9696-play_from_pipe.diff -p2 +upstream_r9935-dont_clobber_file_on_error.diff -p2 +upstream_r10080-fix_non-ascii_comments.diff -p2 +for_upstream-mention_alsa09_in_ogg123.1.diff +for_upstream-oggenc_inputfile_vs_input.wav.diff +for_upstream-mention_option_-R_in_vorbiscomment.1.diff +for_upstream-manpage_typos.diff -p0 +for_upstream-encodage_vs_codage_in_fr.po.diff +no_debian_subdir.diff +no_fast-math.diff +upstream_r10091-ogg123_return_error.diff +for_upstream-ogg123_flac_divbyzero.diff +upstream_r12189-ogg123_2hr_intermittentnoise.diff +upstream_r12201-ogg123_crlf_in_playlists.diff +upstream_r12202-ogg123_curlopt_mute.diff +upstream_r11665_r12199_plus_autoconf.diff -p0 --- vorbis-tools-1.1.1.orig/debian/patches/upstream_r12202-ogg123_curlopt_mute.diff +++ vorbis-tools-1.1.1/debian/patches/upstream_r12202-ogg123_curlopt_mute.diff @@ -0,0 +1,14 @@ +Index: vorbis-tools-1.1.1/ogg123/http_transport.c +=================================================================== +--- vorbis-tools-1.1.1.orig/ogg123/http_transport.c 2007-05-13 19:23:55.500621787 -0400 ++++ vorbis-tools-1.1.1/ogg123/http_transport.c 2007-05-13 19:24:12.826112507 -0400 +@@ -116,7 +116,9 @@ + if (inputOpts.ProxyTunnel) + curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel); + */ ++#ifdef CURLOPT_MUTE + curl_easy_setopt(handle, CURLOPT_MUTE, 1); ++#endif + curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error); + curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback); + curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private); --- vorbis-tools-1.1.1.orig/debian/patches/upstream_r9935-dont_clobber_file_on_error.diff +++ vorbis-tools-1.1.1/debian/patches/upstream_r9935-dont_clobber_file_on_error.diff @@ -0,0 +1,96 @@ +Index: trunk/vorbis-tools/vorbiscomment/vcomment.c +=================================================================== +--- trunk/vorbis-tools/vorbiscomment/vcomment.c (revision 9393) ++++ trunk/vorbis-tools/vorbiscomment/vcomment.c (revision 9935) +@@ -64,5 +64,5 @@ + void parse_options(int argc, char *argv[], param_t *param); + void open_files(param_t *p); +-void close_files(param_t *p); ++void close_files(param_t *p, int output_written); + + +@@ -108,5 +108,5 @@ + fprintf(stderr, _("Failed to open file as vorbis: %s\n"), + vcedit_error(state)); +- close_files(param); ++ close_files(param, 0); + free_param(param); + vcedit_clear(state); +@@ -121,5 +121,5 @@ + vcedit_clear(state); + +- close_files(param); ++ close_files(param, 0); + free_param(param); + return 0; +@@ -134,5 +134,5 @@ + fprintf(stderr, _("Failed to open file as vorbis: %s\n"), + vcedit_error(state)); +- close_files(param); ++ close_files(param, 0); + free_param(param); + vcedit_clear(state); +@@ -175,5 +175,5 @@ + fprintf(stderr, _("Failed to write comments to output file: %s\n"), + vcedit_error(state)); +- close_files(param); ++ close_files(param, 0); + free_param(param); + vcedit_clear(state); +@@ -184,5 +184,5 @@ + vcedit_clear(state); + +- close_files(param); ++ close_files(param, 1); + free_param(param); + return 0; +@@ -528,22 +528,30 @@ + ***********/ + +-void close_files(param_t *p) +-{ +- if (p->in != NULL && p->in != stdin) fclose(p->in); +- if (p->out != NULL && p->out != stdout) fclose(p->out); +- if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com); +- +- if(p->tempoutfile) { +- /* Some platforms fail to rename a file if the new name already exists, +- * so we need to remove, then rename. How stupid. +- */ +- if(rename(p->outfilename, p->infilename)) { +- if(remove(p->infilename)) +- fprintf(stderr, _("Error removing old file %s\n"), p->infilename); +- else if(rename(p->outfilename, p->infilename)) +- fprintf(stderr, _("Error renaming %s to %s\n"), p->outfilename, +- p->infilename); +- } ++void close_files(param_t *p, int output_written) ++{ ++ if (p->in != NULL && p->in != stdin) fclose(p->in); ++ if (p->out != NULL && p->out != stdout) fclose(p->out); ++ if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com); ++ ++ if(p->tempoutfile) { ++ if(output_written) { ++ /* Some platforms fail to rename a file if the new name already ++ * exists, so we need to remove, then rename. How stupid. ++ */ ++ if(rename(p->outfilename, p->infilename)) { ++ if(remove(p->infilename)) ++ fprintf(stderr, _("Error removing old file %s\n"), p->infilename); ++ else if(rename(p->outfilename, p->infilename)) ++ fprintf(stderr, _("Error renaming %s to %s\n"), p->outfilename, ++ p->infilename); ++ } + } +-} +- ++ else { ++ if(remove(p->outfilename)) { ++ fprintf(stderr, _("Error removing erroneous temporary file %s\n"), ++ p->outfilename); ++ } ++ } ++ } ++} ++ --- vorbis-tools-1.1.1.orig/debian/patches/no_debian_subdir.diff +++ vorbis-tools-1.1.1/debian/patches/no_debian_subdir.diff @@ -0,0 +1,31 @@ +My debian/ does not have Makefile.{am,in}. +--- a/Makefile.in ++++ b/Makefile.in +@@ -233,7 +233,7 @@ + target_os = @target_os@ + target_vendor = @target_vendor@ + AUTOMAKE_OPTIONS = foreign dist-zip +-SUBDIRS = po intl include share debian win32 @OPT_SUBDIRS@ ++SUBDIRS = po intl include share win32 @OPT_SUBDIRS@ + DIST_SUBDIRS = po intl include share debian win32 ogg123 oggenc oggdec ogginfo \ + vcut vorbiscomment m4 + +--- a/configure ++++ b/configure +@@ -28678,7 +28678,7 @@ + + + +- ac_config_files="$ac_config_files Makefile m4/Makefile po/Makefile.in intl/Makefile include/Makefile share/Makefile win32/Makefile oggdec/Makefile oggenc/Makefile oggenc/man/Makefile ogg123/Makefile vorbiscomment/Makefile vcut/Makefile ogginfo/Makefile debian/Makefile" ++ ac_config_files="$ac_config_files Makefile m4/Makefile po/Makefile.in intl/Makefile include/Makefile share/Makefile win32/Makefile oggdec/Makefile oggenc/Makefile oggenc/man/Makefile ogg123/Makefile vorbiscomment/Makefile vcut/Makefile ogginfo/Makefile" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -29277,7 +29277,6 @@ + "vorbiscomment/Makefile" ) CONFIG_FILES="$CONFIG_FILES vorbiscomment/Makefile" ;; + "vcut/Makefile" ) CONFIG_FILES="$CONFIG_FILES vcut/Makefile" ;; + "ogginfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES ogginfo/Makefile" ;; +- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; --- vorbis-tools-1.1.1.orig/debian/patches.off/mooch-no_unescaped_dashes_in_manpages.diff +++ vorbis-tools-1.1.1/debian/patches.off/mooch-no_unescaped_dashes_in_manpages.diff @@ -0,0 +1,450 @@ +* Escaped dashes in manpage: Closes: #264365. +diff -u vorbis-tools-1.0.1/oggenc/man/oggenc.1 vorbis-tools-1.0.1/oggenc/man/oggenc.1 +--- vorbis-tools-1.0.1/oggenc/man/oggenc.1 ++++ vorbis-tools-1.0.1/oggenc/man/oggenc.1 +@@ -9,73 +9,73 @@ + .SH SYNOPSIS + .B oggenc + [ +-.B -hrQ ++.B \-hrQ + ] + [ +-.B -B ++.B \-B + .I raw input sample size + ] + [ +-.B -C ++.B \-C + .I raw input number of channels + ] + [ +-.B -R ++.B \-R + .I raw input samplerate + ] + [ +-.B -b ++.B \-b + .I nominal bitrate + ] + [ +-.B -m ++.B \-m + .I minimum bitrate + ] + [ +-.B -M ++.B \-M + .I maximum bitrate + ] + [ +-.B -q ++.B \-q + .I quality + ] + [ +-.B --resample ++.B \-\-resample + .I frequency + ] + [ +-.B --downmix ++.B \-\-downmix + ] + [ +-.B -s ++.B \-s + .I serial + ] + [ +-.B -o ++.B \-o + .I output_file + ] + [ +-.B -n ++.B \-n + .I pattern + ] + [ +-.B -c ++.B \-c + .I extra_comment + ] + [ +-.B -a ++.B \-a + .I artist + ] + [ +-.B -t ++.B \-t + .I title + ] + [ +-.B -l ++.B \-l + .I album + ] + [ +-.B -G ++.B \-G + .I genre + ] + .I input_files \fR... +@@ -91,103 +91,103 @@ + and the Vorbis stream is written to + .I stdout + unless the +-.B -o ++.B \-o + option is used to redirect the output. By default, disk files are + output to Ogg Vorbis files of the same name, with the extension + changed to ".ogg". This naming convention can be overridden by the +-.B -o ++.B \-o + option (in the case of one file) or the +-.B -n ++.B \-n + option (in the case of several files). Finally, if none of these + are available, the output filename will be the input filename with the + extension (that part after the final dot) replaced with ogg, so file.wav + will become file.ogg + + .SH OPTIONS +-.IP "-h, --help" ++.IP "\-h, \-\-help" + Show command help. +-.IP "-r, --raw" +-Assume input data is raw little-endian audio data with no ++.IP "\-r, \-\-raw" ++Assume input data is raw little\-endian audio data with no + header information. If other options are not specified, defaults to 44.1kHz + stereo 16 bit. See next three options for how to change this. +-.IP "-B n, --raw-bits=n" ++.IP "\-B n, \-\-raw\-bits=n" + Sets raw mode input sample size in bits. Default is 16. +-.IP "-C n, --raw-chan=n" ++.IP "\-C n, \-\-raw\-chan=n" + Sets raw mode input number of channels. Default is 2. +-.IP "-R n, --raw-rate=n" ++.IP "\-R n, \-\-raw\-rate=n" + Sets raw mode input samplerate. Default is 44100. +-.IP "--raw-endianness n ++.IP "\-\-raw\-endianness n + Sets raw mode endianness to big endian (1) or little endian (0). Default is + little endian. +-.IP "-Q, --quiet" ++.IP "\-Q, \-\-quiet" + Quiet mode. No messages are displayed. +-.IP "-b n, --bitrate=n" ++.IP "\-b n, \-\-bitrate=n" + Sets encoding to the bitrate closest to n (in kb/s). +-.IP "-m n, --min-bitrate=n" ++.IP "\-m n, \-\-min\-bitrate=n" + Sets minimum bitrate to n (in kb/s). +-.IP "-M n, --max-bitrate=n" ++.IP "\-M n, \-\-max\-bitrate=n" + Sets maximum bitrate to n (in kb/s). +-.IP "--managed" ++.IP "\-\-managed" + Set bitrate management mode. This turns off the normal VBR encoding, but allows + hard or soft bitrate constraints to be enforced by the encoder. This mode is + much slower, and may also be lower quality. It is primarily useful for creating + files for streaming. +-.IP "-q n, --quality=n" +-Sets encoding quality to n, between -1 (low) and 10 (high). This is the default mode of operation, with a default quality level of 3. Fractional quality levels such as 2.5 are permitted. Normal quality range is 0 - 10. +-.IP "--resample n" ++.IP "\-q n, \-\-quality=n" ++Sets encoding quality to n, between \-1 (low) and 10 (high). This is the default mode of operation, with a default quality level of 3. Fractional quality levels such as 2.5 are permitted. Normal quality range is 0 \- 10. ++.IP "\-\-resample n" + Resample input to the given sample rate (in Hz) before encoding. Primarily +-useful for downsampling for lower-bitrate encoding. +-.IP "--downmix" +-Downmix input from stereo to mono (has no effect on non-stereo streams). Useful +-for lower-bitrate encoding. +-.IP "--advanced-encode-option optionname=value" ++useful for downsampling for lower\-bitrate encoding. ++.IP "\-\-downmix" ++Downmix input from stereo to mono (has no effect on non\-stereo streams). Useful ++for lower\-bitrate encoding. ++.IP "\-\-advanced\-encode\-option optionname=value" + Sets an advanced option. See the Advanced Options section for details. +-.IP "-s, --serial" ++.IP "\-s, \-\-serial" + Forces a specific serial number in the output stream. This is primarily useful for testing. +-.IP "--discard-comments" ++.IP "\-\-discard\-comments" + Prevents comments in FLAC and Ogg FLAC files from being copied to the + output Ogg Vorbis file. +-.IP "-o output_file, --output=output_file" ++.IP "\-o output_file, \-\-output=output_file" + Write the Ogg Vorbis stream to + .I output_file + (only valid if a single input file is specified). + +-.IP "-n pattern, --names=pattern" ++.IP "\-n pattern, \-\-names=pattern" + Produce filenames as this string, with %g, %a, %l, %n, %t, %d replaced by + genre, artist, album, track number, title, and date, respectively (see below + for specifying these). Also, %% gives a literal %. + +-.IP "-c comment, --comment comment" ++.IP "\-c comment, \-\-comment comment" + Add the string + .I comment + as an extra comment. This may be used multiple times, and all + instances will be added to each of the input files specified. The argument + should be in the form "tag=value". + +-.IP "-a artist, --artist artist" ++.IP "\-a artist, \-\-artist artist" + Set the artist comment field in the comments to + .I artist. + +-.IP "-G genre, --genre genre" ++.IP "\-G genre, \-\-genre genre" + Set the genre comment field in the comments to + .I genre. + +-.IP "-d date, --date date" ++.IP "\-d date, \-\-date date" + Sets the date comment field to the given value. This should be the date of recording. + +-.IP "-N n, --tracknum n" ++.IP "\-N n, \-\-tracknum n" + Sets the track number comment field to the given value. + +-.IP "-t title, --title title" ++.IP "\-t title, \-\-title title" + Set the track title comment field to + .I title. + +-.IP "-l album, --album album" ++.IP "\-l album, \-\-album album" + Set the album comment field to + .I album. + .PP + +-Note that the \fB-a\fR, \fB-t\fR, and \fB-l\fR options can be given ++Note that the \fB\-a\fR, \fB\-t\fR, and \fB\-l\fR options can be given + multiple times. They will be applied, one to each file, in the order + given. If there are fewer album, title, or artist comments given than + there are input files, +@@ -198,7 +198,7 @@ + .SH ADVANCED ENCODER OPTIONS + + Oggenc allows you to set a number of advanced encoder options using the +-.B --advanced-encode-option ++.B \-\-advanced\-encode\-option + option. These are intended for very advanced users only, and should be + approached with caution. They may significantly degrade audio quality + if misused. Not all these options are currently documented. +@@ -221,57 +221,57 @@ + + Specifying an output filename: + .RS +-oggenc somefile.wav -o out.ogg ++oggenc somefile.wav \-o out.ogg + .RE + .PP + +-Specifying a high-quality encoding averaging 256 kbps (but still VBR). ++Specifying a high\-quality encoding averaging 256 kbps (but still VBR). + .RS +-oggenc infile.wav -b 256 out.ogg ++oggenc infile.wav \-b 256 out.ogg + .RE + .PP + + Specifying a maximum and average bitrate, and enforcing these. + .RS +-oggenc infile.wav --managed -b 128 -M 160 out.ogg ++oggenc infile.wav \-\-managed \-b 128 \-M 160 out.ogg + .RE + .PP + + Specifying quality rather than bitrate (to a very high quality mode) + .RS +-oggenc infile.wav -q 6 out.ogg ++oggenc infile.wav \-q 6 out.ogg + .RE + .PP + + Downsampling and downmixing to 11 kHz mono before encoding. + .RS +-oggenc --resample 11025 --downmix infile.wav -q 1 out.ogg ++oggenc \-\-resample 11025 \-\-downmix infile.wav \-q 1 out.ogg + .RE + .PP + + Adding some info about the track: + .RS +-oggenc somefile.wav -t "The track title" -a "artist who performed this" -l +-"name of album" -c +-"OTHERFIELD=contents of some other field not explictly supported" ++oggenc somefile.wav \-t "The track title" \-a "artist who performed this" \-l ++"name of album" \-c ++"OTHERFIELD=contents of some other field not explicitly supported" + .RE + .PP + + This encodes the three files, each with the + same artist/album tag, but with different title tags on each one. The +-string given as an argument to -n is used to generate filenames, as shown ++string given as an argument to \-n is used to generate filenames, as shown + in the section above. This example gives filenames +-like "The Tea Party - Touch.ogg": ++like "The Tea Party \- Touch.ogg": + .RS +-oggenc -b 192 -a "The Tea Party" -l "Triptych" -t "Touch" track01.wav -t +-"Underground" track02.wav -t "Great Big Lie" track03.wav -n "%a - %t.ogg" ++oggenc \-b 192 \-a "The Tea Party" \-l "Triptych" \-t "Touch" track01.wav \-t ++"Underground" track02.wav \-t "Great Big Lie" track03.wav \-n "%a \- %t.ogg" + .RE + .PP + + Encoding from stdin, to stdout (you can also use the various tagging +-options, like -t, -a, -l, etc.): ++options, like \-t, \-a, \-l, etc.): + .RS +-oggenc - ++oggenc \- + .RE + .PP + +--- vorbis-tools-1.0.1.orig/oggdec/oggdec.1 ++++ vorbis-tools-1.0.1/oggdec/oggdec.1 +@@ -1,60 +1,60 @@ + .TH "oggdec" "1" "2002 July 03" "" "Vorbis Tools" + + .SH "NAME" +-oggdec - simple decoder, Ogg Vorbis file to PCM audio file (WAV or RAW). ++oggdec \- simple decoder, Ogg Vorbis file to PCM audio file (WAV or RAW). + + .SH "SYNOPSIS" + .B oggdec + [ +-.B -Qhv ++.B \-Qhv + ] [ +-.B -b bits_per_sample ++.B \-b bits_per_sample + ] [ +-.B -e endianness ++.B \-e endianness + ] [ +-.B -R ++.B \-R + ] [ +-.B -s signedness ++.B \-s signedness + ] [ +-.B -o outputfile ++.B \-o outputfile + ] + .B file ... + + .SH "DESCRIPTION" + + .B oggdec +-decodes Ogg Vorbis files into PCM-encoded ("uncompressed") audio files, either WAV or RAW format. ++decodes Ogg Vorbis files into PCM\-encoded ("uncompressed") audio files, either WAV or RAW format. + + For each input file, + .B oggdec + writes to a filename based on the input filename, but with the extension changed to ".wav" or ".raw" as appropriate. + + If the input file is specified as +-.B "-" ++.B "\-" + , then + .B oggdec + will read from stdin, and write to stdout unless an output filename is specified. Likewise, an output filename of +-.B - ++.B \- + will cause output to be to stdout. + + Writing WAV format to stdout is a bad idea. WAV requires a seekable medium for the header to be rewritten after all the data is written out; stdout is not seekable. + + .SH "OPTIONS" +-.IP "-q, --quiet" ++.IP "\-q, \-\-quiet" + Suppresses program output. +-.IP "-h, --help" ++.IP "\-h, \-\-help" + Print help message. +-.IP "-v, --version" ++.IP "\-v, \-\-version" + Display version information. +-.IP "-b n, --bits=n" ++.IP "\-b n, \-\-bits=n" + Bits per sample. Valid values are 8 or 16. +-.IP "-e n, --endian=n" +-Set endianness for 16-bit output. 0 (default) is little-endian (Intel byte order). 1 is big-endian (sane byte order). +-.IP "-R, --raw" ++.IP "\-e n, \-\-endian=n" ++Set endianness for 16\-bit output. 0 (default) is little\-endian (Intel byte order). 1 is big\-endian (sane byte order). ++.IP "\-R, \-\-raw" + Output in raw format. If not specified, writes WAV file (RIFF headers). +-.IP "-s n, --sign=n" ++.IP "\-s n, \-\-sign=n" + Set signedness for output. 0 for unsigned, 1 (default) for signed. +-.IP "-o filename, --output=filename" ++.IP "\-o filename, \-\-output=filename" + Write output to specified filename. This option is only valid if one input [file] is specified. + + .SH "EXAMPLES" +@@ -62,7 +62,7 @@ + .B enabler.ogg + to + .B enabler.wav +- as little-endian unsigned 16-bit (default options): ++ as little\-endian unsigned 16\-bit (default options): + .RS + oggdec enabler.ogg + .RE +@@ -71,33 +71,33 @@ + .B enabler.ogg + to + .B enabler.raw +-as headerless little-endian unsigned 16-bit: ++as headerless little\-endian unsigned 16\-bit: + .RS +-oggdec --raw=1 enabler.ogg ++oggdec \-\-raw=1 enabler.ogg + .RE + + Decode + .B enabler.ogg + to + .B enabler.crazymonkey +-as unsigned 8-bit: ++as unsigned 8\-bit: + .RS +-oggdec -b 8 -s 0 -o enabler.crazymonkey enabler.ogg ++oggdec \-b 8 \-s 0 \-o enabler.crazymonkey enabler.ogg + .RE + + Decode + .B enabler.ogg + to + .B enabler.raw +-as big-endian signed 16-bit (any of the following): ++as big\-endian signed 16\-bit (any of the following): + .RS +-oggdec -R -e 1 -b 16 enabler.ogg ++oggdec \-R \-e 1 \-b 16 enabler.ogg + .RE + .RS +-oggdec -R -e 1 -b 16 -o enabler.raw - < enabler.ogg ++oggdec \-R \-e 1 \-b 16 \-o enabler.raw \- < enabler.ogg + .RE + .RS +-oggdec -R -e 1 -b 16 - < enabler.ogg > enabler.raw ++oggdec \-R \-e 1 \-b 16 \- < enabler.ogg > enabler.raw + .RE + + Mass decoding (foo.ogg to foo.wav, bar.ogg to bar.wav, quux.ogg to quux.wav, etc.): --- vorbis-tools-1.1.1.orig/debian/patches.off/mooch-improve_vorbiscomment_help_output.diff +++ vorbis-tools-1.1.1/debian/patches.off/mooch-improve_vorbiscomment_help_output.diff @@ -0,0 +1,61 @@ +* Modified the manpage/help message for vorbiscomment to make it a bit more + userfiendly: +--- vorbis-tools-1.0.1.orig/vorbiscomment/vcomment.c ++++ vorbis-tools-1.0.1/vorbiscomment/vcomment.c +@@ -285,28 +285,35 @@ + { + fprintf(stderr, + _("Usage: \n" +- " vorbiscomment [-l] file.ogg (to list the comments)\n" +- " vorbiscomment -a in.ogg out.ogg (to append comments)\n" +- " vorbiscomment -w in.ogg out.ogg (to modify comments)\n" +- " in the write case, a new set of comments in the form\n" +- " 'TAG=value' is expected on stdin. This set will\n" +- " completely replace the existing set.\n" +- " Either of -a and -w can take only a single filename,\n" +- " in which case a temporary file will be used.\n" +- " -c can be used to take comments from a specified file\n" +- " instead of stdin.\n" +- " Example: vorbiscomment -a in.ogg -c comments.txt\n" +- " will append the comments in comments.txt to in.ogg\n" +- " Finally, you may specify any number of tags to add on\n" +- " the command line using the -t option. e.g.\n" ++ " vorbiscomment [-Vh]\n" ++ " vorbiscomment [-lR] file\n" ++ " vorbiscomment [-qR] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n" ++ "\n" ++ " -l list the comments\n" ++ " -a append comments\n" ++ " -w write comments, replacing the existing ones\n" ++ " -c read the comments from the specified file\n" ++ " -q quiet mode\n" ++ " -V version\n" ++ " -h help\n" ++ " -R, --raw read and write comments in utf8\n" ++ "\n" ++ " If no OUTPUTFILE is specified, vorbiscomment will use a temporary file\n" ++ "\n" ++ " vorbiscomment reads comments from:\n" ++ " - stdin in the form of 'TAG=value'\n" ++ " - a specified file instead of stdin, using '-c '\n" ++ " - the command line, using '-t ' (disables reading from stdin)\n" ++ "\n" ++ " Examples:\n" ++ " vorbiscomment -a in.ogg -c comments.txt\n" + " vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n" +- " (note that when using this, reading comments from the comment\n" +- " file or stdin is disabled)\n" +- " Raw mode (--raw, -R) will read and write comments in utf8,\n" +- " rather than converting to the user's character set. This is\n" +- " useful for using vorbiscomment in scripts. However, this is\n" +- " not sufficient for general round-tripping of comments in all\n" +- " cases.\n") ++ "\n" ++ " NOTE: Raw mode (--raw, -R) will read and write comments in utf8,\n" ++ " rather than converting to the user's character set. This is\n" ++ " useful for using vorbiscomment in scripts. However, this is\n" ++ " not sufficient for general round-tripping of comments in all\n" ++ " cases.\n") + + ); + } --- vorbis-tools-1.1.1.orig/debian/patches.off/for_upstream-update_hu.po.diff +++ vorbis-tools-1.1.1/debian/patches.off/for_upstream-update_hu.po.diff @@ -0,0 +1,1968 @@ +* Updated translation hu.po: Closes: #272037. +--- vorbis-tools-1.0.1.orig/po/hu.po ++++ vorbis-tools-1.0.1/po/hu.po +@@ -1,98 +1,99 @@ + # Hungarian translate of the GNU vorbis-tools. + # Copyright (C) 2002 Free Software Foundation, Inc. +-# Gábor István , 2002. ++# Gábor István , 2002. + # + msgid "" + msgstr "" +-"Project-Id-Version: vorbis-tools-0.99.1.3.1\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2003-12-10 21:49-0600\n" +-"PO-Revision-Date: 2002-08-05 11:38GMT\n" ++"Project-Id-Version: vorbis-tools 1.0\n" ++"POT-Creation-Date: 2002-07-19 22:30+1000\n" ++"PO-Revision-Date: 2004-05-07 11:38GMT\n" + "Last-Translator: Gábor István \n" + "Language-Team: Hungarian \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=ISO-8859-2\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: KBabel 0.9.5\n" + +-#: ogg123/buffer.c:114 ++#: ogg123/buffer.c:111 + msgid "Error: Out of memory in malloc_action().\n" +-msgstr "Hiba: Elfogyott a memória a malloc_action() -ban.\n" ++msgstr "Hiba: Elfogyott a memória a malloc_action()-ban.\n" + +-#: ogg123/buffer.c:347 ++#: ogg123/buffer.c:344 + msgid "Error: Could not allocate memory in malloc_buffer_stats()\n" + msgstr "Hiba: Nem lehet lefoglalni memóriát malloc_buffer_stats()-ban\n" + +-#: ogg123/callbacks.c:71 ++#: ogg123/buffer.c:363 ++msgid "malloc" ++msgstr "malloc" ++ ++#: ogg123/callbacks.c:70 + msgid "Error: Device not available.\n" + msgstr "Hiba: Eszköz nem áll rendelkezésre.\n" + +-#: ogg123/callbacks.c:74 ++#: ogg123/callbacks.c:73 + #, c-format + msgid "Error: %s requires an output filename to be specified with -f.\n" + msgstr "Hiba: %s-nek szükséges egy kimeneti fájlnevet meghatározni a -f el.\n" + +-#: ogg123/callbacks.c:77 ++#: ogg123/callbacks.c:76 + #, c-format + msgid "Error: Unsupported option value to %s device.\n" +-msgstr "Hiba:Nem támogatott opció a %s eszközön.\n" ++msgstr "Hiba: Nem támogatott opcióérték a %s eszköznek.\n" + +-#: ogg123/callbacks.c:81 ++#: ogg123/callbacks.c:80 + #, c-format + msgid "Error: Cannot open device %s.\n" + msgstr "Hiba: Nem lehet megnyitni a %s eszközt.\n" + +-#: ogg123/callbacks.c:85 ++#: ogg123/callbacks.c:84 + #, c-format + msgid "Error: Device %s failure.\n" + msgstr "Hiba: %s eszköz hibás.\n" + +-#: ogg123/callbacks.c:88 ++#: ogg123/callbacks.c:87 + #, c-format + msgid "Error: An output file cannot be given for %s device.\n" + msgstr "Hiba: A kimeneti fájlt nem lehet átadni a %s eszköznek.\n" + +-#: ogg123/callbacks.c:91 ++#: ogg123/callbacks.c:90 + #, c-format + msgid "Error: Cannot open file %s for writing.\n" + msgstr "Hiba: A %s fájlt nem lehet megnyitni írásra.\n" + +-#: ogg123/callbacks.c:95 ++#: ogg123/callbacks.c:94 + #, c-format + msgid "Error: File %s already exists.\n" + msgstr "Hiba: A %s fájl már létezik.\n" + +-#: ogg123/callbacks.c:98 ++#: ogg123/callbacks.c:97 + #, c-format + msgid "Error: This error should never happen (%d). Panic!\n" +-msgstr "Hiba: Ez a hiba soha nem történhet meg(%d). Baj van!\n" ++msgstr "Hiba: Ez a hiba soha nem történhet meg (%d). Baj van!\n" + +-#: ogg123/callbacks.c:121 ogg123/callbacks.c:126 ++#: ogg123/callbacks.c:120 ogg123/callbacks.c:125 + msgid "Error: Out of memory in new_audio_reopen_arg().\n" +-msgstr "Hiba: Elfogyott a memória a new_audio_reopen_arg() ban.\n" ++msgstr "Hiba: Elfogyott a memória a new_audio_reopen_arg()-ban.\n" + +-#: ogg123/callbacks.c:170 ++#: ogg123/callbacks.c:169 + msgid "Error: Out of memory in new_print_statistics_arg().\n" +-msgstr "Hiba: Elfogyott a memória a new_print_statistics_arg() ban .\n" ++msgstr "Hiba: Elfogyott a memória a new_print_statistics_arg()-ban .\n" + +-#: ogg123/callbacks.c:229 ++#: ogg123/callbacks.c:228 + msgid "Error: Out of memory in new_status_message_arg().\n" +-msgstr "Hiba: Elfogyott a memória a new_status_message_arg() ban .\n" ++msgstr "Hiba: Elfogyott a memória a new_status_message_arg()-ban .\n" + +-#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331 +-#: ogg123/callbacks.c:350 ++#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330 ++#: ogg123/callbacks.c:349 + msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n" +-msgstr "" +-"Hiba: Elfogyott a memória a decoder_buffered_metadata_callback() ban .\n" ++msgstr "Hiba: Elfogyott a memória a decoder_buffered_metadata_callback()-ban .\n" + + #: ogg123/cfgfile_options.c:51 + msgid "System error" +-msgstr "Rendszer hiba" ++msgstr "Rendszerhiba" + + #: ogg123/cfgfile_options.c:54 + #, c-format + msgid "=== Parse error: %s on line %d of %s (%s)\n" +-msgstr "=== Értelmezési hiba: %s sorban a %d ban %s (%s)\n" ++msgstr "=== Értelmezési hiba: %s a(z) %d. sorban %s (%s)\n" + + #. Column headers + #. Name +@@ -121,7 +122,7 @@ + + #: ogg123/cfgfile_options.c:168 + msgid "bool" +-msgstr "bool" ++msgstr "logikai" + + #: ogg123/cfgfile_options.c:171 + msgid "char" +@@ -141,7 +142,7 @@ + + #: ogg123/cfgfile_options.c:183 + msgid "double" +-msgstr "dupla" ++msgstr "duplapontos" + + #: ogg123/cfgfile_options.c:186 + msgid "other" +@@ -149,11 +150,11 @@ + + #: ogg123/cfgfile_options.c:192 + msgid "(NULL)" +-msgstr "(NULLA)" ++msgstr "(NULL)" + +-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:521 oggenc/oggenc.c:526 +-#: oggenc/oggenc.c:531 oggenc/oggenc.c:536 oggenc/oggenc.c:541 +-#: oggenc/oggenc.c:546 ++#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:506 oggenc/oggenc.c:511 ++#: oggenc/oggenc.c:516 oggenc/oggenc.c:521 oggenc/oggenc.c:526 ++#: oggenc/oggenc.c:531 + msgid "(none)" + msgstr "(nincs)" + +@@ -181,96 +182,85 @@ + msgid "Unknown error" + msgstr "Ismeretlen hiba" + +-#: ogg123/cmdline_options.c:86 +-#, fuzzy ++#: ogg123/cmdline_options.c:74 + msgid "Internal error parsing command line options.\n" +-msgstr "Belső hiba a parancs sori opció elemzése során\n" ++msgstr "Belső hiba a parancssori opciók elemzése során\n" + +-#: ogg123/cmdline_options.c:93 ++#: ogg123/cmdline_options.c:81 + #, c-format + msgid "Input buffer size smaller than minimum size of %dkB." +-msgstr "Bevitel puffer mérete kisebb méret mint %dkB." ++msgstr "Bevitel puffer mérete kisebb, mint %d kB." + +-#: ogg123/cmdline_options.c:105 ++#: ogg123/cmdline_options.c:93 + #, c-format + msgid "" + "=== Error \"%s\" while parsing config option from command line.\n" + "=== Option was: %s\n" + msgstr "" +-"===Hiba \"%s\" a parancs sori opciók értelmezése közben\n" +-"===Opció %s volt\n" ++"===Hiba \"%s\" a parancssori opciók értelmezése közben.\n" ++"===A hibás opció: %s\n" + + #. not using the status interface here +-#: ogg123/cmdline_options.c:112 ++#: ogg123/cmdline_options.c:100 + msgid "Available options:\n" + msgstr "Rendelkezésre álló opciók:\n" + +-#: ogg123/cmdline_options.c:121 ++#: ogg123/cmdline_options.c:109 + #, c-format + msgid "=== No such device %s.\n" +-msgstr "=== Nem ilyen eszköz: %s.\n" ++msgstr "=== Nincs ilyen eszköz: %s.\n" + +-#: ogg123/cmdline_options.c:141 ++#: ogg123/cmdline_options.c:129 + #, c-format + msgid "=== Driver %s is not a file output driver.\n" + msgstr "=== Meghajtó %s nem kimeneti fájlba irányítható meghajtó.\n" + +-#: ogg123/cmdline_options.c:146 ++#: ogg123/cmdline_options.c:134 + msgid "=== Cannot specify output file without specifying a driver.\n" +-msgstr "" +-"=== Nem lehet meghatározni a kimeneti fájlt meghajtó meghatározása nélkül.\n" ++msgstr "=== Nem lehet meghatározni a kimeneti fájlt meghajtó meghatározása nélkül.\n" + +-#: ogg123/cmdline_options.c:165 ++#: ogg123/cmdline_options.c:149 + #, c-format + msgid "=== Incorrect option format: %s.\n" + msgstr "==== Érvénytelen kimeneti formátum: %s.\n" + +-#: ogg123/cmdline_options.c:180 ++#: ogg123/cmdline_options.c:164 + msgid "--- Prebuffer value invalid. Range is 0-100.\n" +-msgstr "--- Előbuffer érték érvénytelen. Érvényes tartomány: 0-100.\n" ++msgstr "--- Előbuffer értéke érvénytelen. Érvényes tartomány: 0-100.\n" + +-#: ogg123/cmdline_options.c:195 ++#: ogg123/cmdline_options.c:179 + #, c-format + msgid "ogg123 from %s %s\n" + msgstr "ogg123 a %s %s -ból\n" + +-#: ogg123/cmdline_options.c:202 ++#: ogg123/cmdline_options.c:186 + msgid "--- Cannot play every 0th chunk!\n" + msgstr "--- Nem lehet lejátszani a 0-dik csonkokat!\n" + +-#: ogg123/cmdline_options.c:210 ++#: ogg123/cmdline_options.c:194 + msgid "" + "--- Cannot play every chunk 0 times.\n" + "--- To do a test decode, use the null output driver.\n" + msgstr "" +-"--- Nem lehet lejátszani a nulla csonkokat.\n" +-"--- A kódólás kipróbálásához használja a null kimeneti meghatjót.\n" ++"--- Nem lehet lejátszani minden csonkot 0-szor.\n" ++"--- A dekódólás kipróbálásához használja a null kimeneti meghajtót.\n" + +-#: ogg123/cmdline_options.c:222 +-#, fuzzy, c-format ++#: ogg123/cmdline_options.c:206 ++#, c-format + msgid "--- Cannot open playlist file %s. Skipped.\n" +-msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s fájlt\n" ++msgstr "--- Nem lehet megnyitni a lejátszandó számok fájlját: %s. Átugorva.\n" + +-#: ogg123/cmdline_options.c:238 +-msgid "=== Option conflict: End time is before start time.\n" +-msgstr "" +- +-#: ogg123/cmdline_options.c:251 ++#: ogg123/cmdline_options.c:227 + #, c-format + msgid "--- Driver %s specified in configuration file invalid.\n" +-msgstr "" +-"--- A konfigurációs állmányban meghatározott %s meghajtó érvénytelen.\n" ++msgstr "--- A konfigurációs állományban meghatározott %s meghajtó érvénytelen.\n" + +-#: ogg123/cmdline_options.c:261 +-msgid "" +-"=== Could not load default driver and no driver specified in config file. " +-"Exiting.\n" +-msgstr "" +-"=== Nem lehet betölteni az alapértelmezés szerinti meghajtót és nincs " +-"meghajtó meghatározva a beállítás fájlban. Kilép.\n" ++#: ogg123/cmdline_options.c:237 ++msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n" ++msgstr "=== Nem lehet betölteni az alapértelmezés szerinti meghajtót, és nincs meghajtó meghatározva a konfigurációs fájlban. Kilépés.\n" + +-#: ogg123/cmdline_options.c:282 +-#, fuzzy, c-format ++#: ogg123/cmdline_options.c:258 ++#, c-format + msgid "" + "ogg123 from %s %s\n" + " by the Xiph.org Foundation (http://www.xiph.org/)\n" +@@ -290,38 +280,36 @@ + "\n" + " -h, --help ez a segítség\n" + " -V, --version az Ogg123 verziójának a megjelenítése\n" +-" -d, --device=a kimeneti egység meghatározása\n" ++" -d, --device=d a 'd' kimeneti eszköz meghatározása\n" + " Lehetséges eszközök ('*'=live, '@'=file):\n" + " " + +-#: ogg123/cmdline_options.c:303 +-#, fuzzy, c-format ++#: ogg123/cmdline_options.c:279 ++#, c-format + msgid "" + " -f, --file=filename Set the output filename for a previously\n" + " specified file device (with -d).\n" +-" -k n, --skip n Skip the first 'n' seconds (or hh:mm:ss format)\n" +-" -K n, --end n End at 'n' seconds (or hh:mm:ss format)\n" ++" -k n, --skip n Skip the first 'n' seconds\n" + " -o, --device-option=k:v passes special option k with value\n" + " v to previously specified device (with -d). See\n" + " man page for more info.\n" +-" -@, --list=filename Read playlist of files and URLs from \"filename\"\n" +-" -b n, --buffer n Use an input buffer of 'n' kilobytes\n" +-" -p n, --prebuffer n Load n%% of the input buffer before playing\n" +-" -v, --verbose Display progress and other status information\n" +-" -q, --quiet Don't display anything (no title)\n" +-" -x n, --nth Play every 'n'th block\n" +-" -y n, --ntimes Repeat every played block 'n' times\n" +-" -z, --shuffle Shuffle play\n" ++" -b n, --buffer n use an input buffer of 'n' kilobytes\n" ++" -p n, --prebuffer n load n%% of the input buffer before playing\n" ++" -v, --verbose display progress and other status information\n" ++" -q, --quiet don't display anything (no title)\n" ++" -x n, --nth play every 'n'th block\n" ++" -y n, --ntimes repeat every played block 'n' times\n" ++" -z, --shuffle shuffle play\n" + "\n" + "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n" + "s milliseconds make ogg123 terminate.\n" +-" -l, --delay=s Set s [milliseconds] (default 500).\n" ++" -l, --delay=s set s [milliseconds] (default 500).\n" + msgstr "" +-" -f, --file=fájlnév Beállítja a kiemeneti fájlnevet az előzőleg\n" ++" -f, --file=fájlnév Beállítja a kimeneti fájlnevet az előzőleg\n" + " meghatározott eszközhöz (a '-d'-vel).\n" + " -k n, --skip n Átugorja az első 'n' másodpercet\n" + " -o, --device-option=k:v átírja a speciális opciót a k értékével\n" +-" a v előzőleg meghatázott eszközt (a '-d'-vel). Több\n" ++" a v előzőleg meghatázott eszközt (a '-d'-vel). További\n" + " információhoz nézze meg man lapot.\n" + " -b n, --buffer n 'n' kilobájt bemeneti puffert használ\n" + " -p n, --prebuffer n betölt n%% a bemeneti pufferbe lejátszás előtt\n" +@@ -331,138 +319,163 @@ + " -y n, --ntimes megismétel minden lejátszott blokkot 'n'-szer\n" + " -z, --shuffle véletlen lejátszás\n" + "\n" +-"ogg123 átugrik a következő számra ha egy SIGINT (Ctrl-C) jelet kap; két " +-"SIGINT\n" ++"ogg123 átugrik a következő számra ha egy SIGINT (Ctrl-C) jelet kap; két SIGINT\n" + "s ezredmásodpercen belül akkor megszakad az ogg123 futása.\n" + " -l, --delay=s beállítja s [ezredmásodperc] (alapból 500).\n" + +-#: ogg123/file_transport.c:58 ogg123/http_transport.c:209 +-#: ogg123/oggvorbis_format.c:91 ++#: ogg123/file_transport.c:58 ogg123/http_transport.c:203 ++#: ogg123/oggvorbis_format.c:106 ogg123/oggvorbis_format.c:321 ++#: ogg123/oggvorbis_format.c:336 ogg123/oggvorbis_format.c:354 + msgid "Error: Out of memory.\n" + msgstr "Hiba: Elfogyott a memória.\n" + +-#: ogg123/format.c:78 ++#: ogg123/format.c:59 + msgid "Error: Could not allocate memory in malloc_decoder_stats()\n" +-msgstr "Hiba: Nem lehet lefoglalni memóriát a malloc_decoder_stats() -ban\n" ++msgstr "Hiba: Nem lehet lefoglalni memóriát a malloc_decoder_stats()-ban\n" + +-#: ogg123/http_transport.c:139 ++#: ogg123/http_transport.c:137 + msgid "Error: Could not set signal mask." +-msgstr "Hiba: Nem lehet beállítani a szignál maszkot." ++msgstr "Hiba: Nem lehet beállítani a szignálmaszkot." + +-#: ogg123/http_transport.c:196 ++#: ogg123/http_transport.c:191 + msgid "Error: Unable to create input buffer.\n" + msgstr "Hiba: Nem lehet létrehozni a bemeneti puffert.\n" + + #. found, name, description, type, ptr, default + #: ogg123/ogg123.c:75 + msgid "default output device" +-msgstr "alapértelmezés szerinti kimenet eszköz" ++msgstr "alapértelmezés szerinti kimeneti eszköz" + + #: ogg123/ogg123.c:77 + msgid "shuffle playlist" + msgstr "véletelen lejátszási lista" + +-#: ogg123/ogg123.c:277 +-#, fuzzy, c-format ++#: ogg123/ogg123.c:261 ++#, c-format + msgid "" + "\n" + "Audio Device: %s" + msgstr "" + "\n" +-"Eszköz: %s" ++"Audioeszköz: %s" + +-#: ogg123/ogg123.c:278 ++#: ogg123/ogg123.c:262 + #, c-format + msgid "Author: %s" + msgstr "Szerző: %s" + +-#: ogg123/ogg123.c:279 ++#: ogg123/ogg123.c:263 + #, fuzzy, c-format + msgid "Comments: %s" + msgstr "Megjegyzések: %s\n" + +-#: ogg123/ogg123.c:323 ogg123/playlist.c:155 +-#, fuzzy, c-format ++#: ogg123/ogg123.c:307 ogg123/playlist.c:155 ++#, c-format + msgid "Warning: Could not read directory %s.\n" +-msgstr "Nem lehet létrehozni a könyvtárat \"%s\": %s\n" ++msgstr "Figyelmeztetés: Nem lehet olvasni a könyvtárat: %s.\n" + +-#: ogg123/ogg123.c:357 ++#: ogg123/ogg123.c:341 + msgid "Error: Could not create audio buffer.\n" +-msgstr "Hiba: Nem lehet létrehozni a audio puffert.\n" ++msgstr "Hiba: Nem lehet létrehozni az audiopuffert.\n" + +-#: ogg123/ogg123.c:445 ++#: ogg123/ogg123.c:429 + #, c-format + msgid "No module could be found to read from %s.\n" +-msgstr "Nem találtam modult a %s belovasása során.\n" ++msgstr "Nem találtam modult a %s beolvasása során.\n" + +-#: ogg123/ogg123.c:450 ++#: ogg123/ogg123.c:434 + #, c-format + msgid "Cannot open %s.\n" +-msgstr "Nem lehet megnyitni a %s-t.\n" ++msgstr "Nem lehet megnyitni %s-t.\n" + +-#: ogg123/ogg123.c:456 ++#: ogg123/ogg123.c:440 + #, c-format + msgid "The file format of %s is not supported.\n" +-msgstr "A %s fájl formátum nem támogatott.\n" ++msgstr "A(z) %s fájl formátum nem támogatott.\n" + +-#: ogg123/ogg123.c:466 ++#: ogg123/ogg123.c:450 + #, c-format + msgid "Error opening %s using the %s module. The file may be corrupted.\n" +-msgstr "" +-"Hiba a %s megnyitása közben ami a %s modult használna. A fájl lehet, hogy " +-"sérült.\n" ++msgstr "Hiba a %s megnyitása közben, ami a %s modult használna. A fájl lehet, hogy sérült.\n" + +-#: ogg123/ogg123.c:485 ++#: ogg123/ogg123.c:469 + #, c-format + msgid "Playing: %s" + msgstr "Lejátszás: %s" + +-#: ogg123/ogg123.c:490 ++#: ogg123/ogg123.c:474 + #, c-format + msgid "Could not skip %f seconds of audio." + msgstr "Nem lehet átugrani %f másodpercet ." + +-#: ogg123/ogg123.c:532 ++#: ogg123/ogg123.c:512 + msgid "Error: Decoding failure.\n" +-msgstr "Hiba: Visszakódólás nem sikerült.\n" ++msgstr "Hiba: Dekódolás nem sikerült.\n" + + #. In case we were killed mid-output +-#: ogg123/ogg123.c:611 ++#: ogg123/ogg123.c:585 + msgid "Done." + msgstr "Kész." + +-#: ogg123/oggvorbis_format.c:153 ++#: ogg123/oggvorbis_format.c:51 ++msgid "Track number:" ++msgstr "Sáv száma:" ++ ++#: ogg123/oggvorbis_format.c:52 ++msgid "ReplayGain (Track):" ++msgstr "" ++ ++#: ogg123/oggvorbis_format.c:53 ++msgid "ReplayGain (Album):" ++msgstr "" ++ ++#: ogg123/oggvorbis_format.c:54 ++msgid "ReplayGain (Track) Peak:" ++msgstr "" ++ ++#: ogg123/oggvorbis_format.c:55 ++msgid "ReplayGain (Album) Peak:" ++msgstr "" ++ ++#: ogg123/oggvorbis_format.c:56 ++msgid "Copyright" ++msgstr "Copyright" ++ ++#: ogg123/oggvorbis_format.c:57 ogg123/oggvorbis_format.c:58 ++msgid "Comment:" ++msgstr "Megjegyzés:" ++ ++#: ogg123/oggvorbis_format.c:167 + msgid "--- Hole in the stream; probably harmless\n" +-msgstr "--- Lyuk a adatfolyamban, lehet hogy ártalmatlan\n" ++msgstr "--- Lyuk a adatfolyamban, valószínűleg ártalmatlan\n" + +-#: ogg123/oggvorbis_format.c:159 ++#: ogg123/oggvorbis_format.c:173 + msgid "=== Vorbis library reported a stream error.\n" +-msgstr "=== a vorbis programozói könyvtár adatfolyam hibát jelentett.\n" ++msgstr "=== A vorbis programozói könyvtár adatfolyamhibát jelentett.\n" + +-#: ogg123/oggvorbis_format.c:303 +-#, fuzzy, c-format +-msgid "Ogg Vorbis stream: %d channel, %ld Hz" +-msgstr "Bitfolyam %d csatornán, %ldHz" +- +-#: ogg123/oggvorbis_format.c:308 ++#: ogg123/oggvorbis_format.c:402 + #, c-format +-msgid "Vorbis format: Version %d" +-msgstr "" ++msgid "Version is %d" ++msgstr "Verzió: %d" + +-#: ogg123/oggvorbis_format.c:312 ++#: ogg123/oggvorbis_format.c:406 + #, c-format + msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld" + msgstr "Bitráta adatok: felső=%ld névleges=%ld alsó=%ld ablak=%ld" + +-#: ogg123/oggvorbis_format.c:320 ++#: ogg123/oggvorbis_format.c:414 ++#, c-format ++msgid "Bitstream is %d channel, %ldHz" ++msgstr "A bitfolyam %d csatornás, %ld Hz" ++ ++#: ogg123/oggvorbis_format.c:419 + #, c-format + msgid "Encoded by: %s" +-msgstr "Kódolva: %s-el" ++msgstr "Kódolva: %s módszerrel" + + #: ogg123/playlist.c:41 ogg123/playlist.c:52 +-#, fuzzy + msgid "Error: Out of memory in create_playlist_member().\n" +-msgstr "Hiba: Elfogyott a memória a new_status_message_arg() ban .\n" ++msgstr "Hiba: Elfogyott a memória a create_playlist_member()-ben.\n" + + #: ogg123/playlist.c:214 + #, c-format +@@ -470,12 +483,11 @@ + msgstr "" + + #: ogg123/playlist.c:259 ogg123/playlist.c:271 +-#, fuzzy + msgid "Error: Out of memory in playlist_to_array().\n" +-msgstr "Hiba: Elfogyott a memória a malloc_action() -ban.\n" ++msgstr "Hiba: Elfogyott a memória a playlist_to_array()-ben.\n" + + #: ogg123/status.c:47 +-#, fuzzy, c-format ++#, c-format + msgid "%sPrebuf to %.1f%%" + msgstr "%sElőpufferelés %1.f%%" + +@@ -492,7 +504,7 @@ + #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223 + #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288 + msgid "Memory allocation error in stats_init()\n" +-msgstr "Memória kiosztás hiba a stats_init()-ban\n" ++msgstr "Memóriakiosztási hiba a stats_init()-ben\n" + + #: ogg123/status.c:198 + #, c-format +@@ -507,12 +519,12 @@ + #: ogg123/status.c:232 + #, c-format + msgid "of %s" +-msgstr "%s-é" ++msgstr "/ %s" + + #: ogg123/status.c:252 + #, c-format + msgid "Avg bitrate: %5.1f" +-msgstr "Átl bitráta: %5.1f" ++msgstr "Átl. bitráta: %5.1f" + + #: ogg123/status.c:258 + #, c-format +@@ -526,87 +538,74 @@ + + #: ogg123/transport.c:67 + msgid "Error: Could not allocate memory in malloc_data_source_stats()\n" +-msgstr "" +-"Hiba: Nem tudom lefoglalni a memóriát a malloc_data_source_stats()-ban\n" ++msgstr "Hiba: Nem tudom lefoglalni a memóriát a malloc_data_source_stats()-ban\n" + +-#: oggenc/audio.c:43 ++#: oggenc/audio.c:39 + msgid "WAV file reader" +-msgstr "WAV fájl olvasó" ++msgstr "WAV-fájl olvasó" + +-#: oggenc/audio.c:44 ++#: oggenc/audio.c:40 + msgid "AIFF/AIFC file reader" +-msgstr "AIFF/AIFC fájl olvasó" ++msgstr "AIFF/AIFC-fájl olvasó" + +-#: oggenc/audio.c:46 +-#, fuzzy +-msgid "FLAC file reader" +-msgstr "WAV fájl olvasó" +- +-#: oggenc/audio.c:47 +-#, fuzzy +-msgid "Ogg FLAC file reader" +-msgstr "WAV fájl olvasó" +- +-#: oggenc/audio.c:124 oggenc/audio.c:391 ++#: oggenc/audio.c:117 oggenc/audio.c:374 + msgid "Warning: Unexpected EOF in reading WAV header\n" +-msgstr "Figyelmeztetés: Váratlan fájl vég a WAV fejlécben\n" ++msgstr "Figyelmeztetés: Váratlan fájlvég a WAV-fejlécben\n" + +-#: oggenc/audio.c:135 ++#: oggenc/audio.c:128 + #, c-format + msgid "Skipping chunk of type \"%s\", length %d\n" + msgstr "\"%s\" típusú csonk átugrása, hossz: %d\n" + +-#: oggenc/audio.c:153 ++#: oggenc/audio.c:146 + msgid "Warning: Unexpected EOF in AIFF chunk\n" + msgstr "Figyelmeztetés: Váratlan fájl vég az AIFF csonkban\n" + +-#: oggenc/audio.c:238 ++#: oggenc/audio.c:231 + msgid "Warning: No common chunk found in AIFF file\n" + msgstr "Figyelmeztetés: Nem találtam közös csonkot az AIFF fájlban\n" + +-#: oggenc/audio.c:244 ++#: oggenc/audio.c:237 + msgid "Warning: Truncated common chunk in AIFF header\n" + msgstr "Figyelmeztetés: Csonkított közös csonk az AIFF fejlécben\n" + +-#: oggenc/audio.c:252 ++#: oggenc/audio.c:245 + msgid "Warning: Unexpected EOF in reading AIFF header\n" + msgstr "Figyelmeztetés: Váratlan fájl vég az AIFF fejlécben\n" + +-#: oggenc/audio.c:267 ++#: oggenc/audio.c:258 + msgid "Warning: AIFF-C header truncated.\n" + msgstr "Figyelmeztetés: AIFF-C fejléc csonkított.\n" + +-#: oggenc/audio.c:281 +-#, fuzzy, c-format +-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n" ++#: oggenc/audio.c:263 ++msgid "Warning: Can't handle compressed AIFF-C\n" + msgstr "Figyelmeztetés: Nem tudom kezelni a tömörített AIFF-C-t\n" + +-#: oggenc/audio.c:288 ++#: oggenc/audio.c:270 + msgid "Warning: No SSND chunk found in AIFF file\n" + msgstr "Figyelmeztetés: Nem találtam SSND csonkot az AIFF fájlban\n" + +-#: oggenc/audio.c:294 ++#: oggenc/audio.c:276 + msgid "Warning: Corrupted SSND chunk in AIFF header\n" + msgstr "Figyelmeztetés: Sérült az SSND csonk az AIFF fájlban\n" + +-#: oggenc/audio.c:300 ++#: oggenc/audio.c:282 + msgid "Warning: Unexpected EOF reading AIFF header\n" + msgstr "Figyelmeztetés: Váratlan fájlvég az AIFF fejlécben\n" + +-#: oggenc/audio.c:331 +-#, fuzzy ++#: oggenc/audio.c:314 + msgid "" + "Warning: OggEnc does not support this type of AIFF/AIFC file\n" +-" Must be 8, 16, or 24 bit PCM.\n" ++" Must be 8 or 16 bit PCM.\n" + msgstr "" + "Figyelmeztetés: Az OggEnc nem támogatja ezt a típusú AIFF/AIFC fájlt\n" + " 8 vagy 16 bit-es PCM kell hogy legyen.\n" + +-#: oggenc/audio.c:374 ++#: oggenc/audio.c:357 + msgid "Warning: Unrecognised format chunk in WAV header\n" + msgstr "Figyelmeztetés: Ismeretlen formátumú csonk a WAV fejlécben\n" + +-#: oggenc/audio.c:386 ++#: oggenc/audio.c:369 + msgid "" + "Warning: INVALID format chunk in wav header.\n" + " Trying to read anyway (may not work)...\n" +@@ -614,7 +613,7 @@ + "Figyelmeztetés: ÉRVÉNYTELEN formátumú csonk a wav fejlécben\n" + " Megprobálom mindenkép elolvasni (lehet hogy nem fog működni)...\n" + +-#: oggenc/audio.c:423 ++#: oggenc/audio.c:406 + msgid "" + "ERROR: Wav file is unsupported type (must be standard PCM\n" + " or type 3 floating point PCM\n" +@@ -622,31 +621,19 @@ + "HIBA: A Wav fájl nem támogatott típusú (normális PCM\n" + " vagy 5-as típusú lebegő pontos PCM)\n" + +-#: oggenc/audio.c:475 +-#, fuzzy ++#: oggenc/audio.c:455 + msgid "" +-"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n" ++"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n" + "or floating point PCM\n" + msgstr "" + "HIBA: A WAV fájl nem támogatott alformátumott tartalmazz( 16-bites PCM \n" + "vagy lebegő pontos PCM-nek kell lennie)\n" + +-#: oggenc/audio.c:550 +-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n" +-msgstr "" +- +-#: oggenc/audio.c:556 +-#, c-format +-msgid "Internal error: attempt to read unsupported bitdepth %d\n" ++#: oggenc/audio.c:607 ++msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n" + msgstr "" + +-#: oggenc/audio.c:653 +-msgid "" +-"BUG: Got zero samples from resampler: your file will be truncated. Please " +-"report this.\n" +-msgstr "" +- +-#: oggenc/audio.c:671 ++#: oggenc/audio.c:625 + msgid "Couldn't initialise resampler\n" + msgstr "" + +@@ -666,9 +653,7 @@ + msgstr "%s: a `--%s' kapcsoló ismeretlen\n" + + #: oggenc/encode.c:133 +-msgid "" +-"255 channels should be enough for anyone. (Sorry, vorbis doesn't support " +-"more)\n" ++msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n" + msgstr "" + + #: oggenc/encode.c:141 +@@ -677,13 +662,11 @@ + + #: oggenc/encode.c:159 + msgid "Mode initialisation failed: invalid parameters for quality\n" +-msgstr "" +-"Mód installáció nem sikerült: ennek a minőségnek érvénytelen a paramétere\n" ++msgstr "Mód installáció nem sikerült: ennek a minőségnek érvénytelen a paramétere\n" + + #: oggenc/encode.c:183 + msgid "Mode initialisation failed: invalid parameters for bitrate\n" +-msgstr "" +-"Mód installáció nem sikerült: ennek a bitrátának érvénytelen a paramétere\n" ++msgstr "Mód installáció nem sikerült: ennek a bitrátának érvénytelen a paramétere\n" + + #: oggenc/encode.c:237 + msgid "Failed writing header to output stream\n" +@@ -696,12 +679,12 @@ + #: oggenc/encode.c:349 + #, c-format + msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c" +-msgstr "\t[%5.1f%%] [%2dm%.2ds átnevezés] %c" ++msgstr "\t[%5.1f%%] [%2dm%.2ds van még hátra] %c" + + #: oggenc/encode.c:359 + #, c-format + msgid "\tEncoding [%2dm%.2ds so far] %c" +-msgstr "\tKódólás [%2dm%.2ds ] %c" ++msgstr "\tKódólás [%2dm%.2ds telt el eddig] %c" + + #: oggenc/encode.c:377 + #, c-format +@@ -736,7 +719,7 @@ + #: oggenc/encode.c:387 + #, c-format + msgid "\tElapsed time: %dm %04.1fs\n" +-msgstr "\tHátralévő idő: %dm %04.1fs\n" ++msgstr "\tEltelt idő: %dm %04.1fs\n" + + #: oggenc/encode.c:390 + #, c-format +@@ -814,7 +797,7 @@ + " %s%s%s bitráta %d kbps,\n" + "teljes bitrátakezelő motort használom\n" + +-#: oggenc/oggenc.c:98 ++#: oggenc/oggenc.c:96 + #, c-format + msgid "" + "%s%s\n" +@@ -823,70 +806,57 @@ + "%s%s\n" + "HIBA: Nincs bemeneti fájl meghatározva. Használja a '-h' segítségért.\n" + +-#: oggenc/oggenc.c:113 ++#: oggenc/oggenc.c:111 + msgid "ERROR: Multiple files specified when using stdin\n" + msgstr "HIBA: Több fájlt határozott meg amikor az stdin-t használta\n" + +-#: oggenc/oggenc.c:120 +-msgid "" +-"ERROR: Multiple input files with specified output filename: suggest using -" +-"n\n" +-msgstr "" +-"HIBA: Több bemeneti fájlt adott meg mikor határozta a kimeneti fájlnevet, " +-"javaslom használja a '-n'-t\n" ++#: oggenc/oggenc.c:118 ++msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n" ++msgstr "HIBA: Több bemeneti fájlt adott meg mikor határozta a kimeneti fájlnevet, javaslom használja a '-n'-t\n" + +-#: oggenc/oggenc.c:176 ++#: oggenc/oggenc.c:172 + #, c-format + msgid "ERROR: Cannot open input file \"%s\": %s\n" + msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s fájlt\n" + +-#: oggenc/oggenc.c:204 ++#: oggenc/oggenc.c:200 + #, c-format + msgid "Opening with %s module: %s\n" + msgstr "A %s megnyitása %s modullal \n" + +-#: oggenc/oggenc.c:213 ++#: oggenc/oggenc.c:209 + #, c-format + msgid "ERROR: Input file \"%s\" is not a supported format\n" + msgstr "HIBA Bemeneti fájl \"%s\" formátuma nem támogatott\n" + +-#: oggenc/oggenc.c:263 ++#: oggenc/oggenc.c:259 + msgid "WARNING: No filename, defaulting to \"default.ogg\"\n" +-msgstr "" +-"FIGYELEM: Nem határozott meg fájlnevet, az alapértelmezés szerinti \"default." +-"ogg\"-t használom\n" ++msgstr "FIGYELEM: Nem határozott meg fájlnevet, az alapértelmezés szerinti \"default.ogg\"-t használom\n" + +-#: oggenc/oggenc.c:271 ++#: oggenc/oggenc.c:267 + #, c-format +-msgid "" +-"ERROR: Could not create required subdirectories for output filename \"%s\"\n" +-msgstr "" +-"HIBA: Nem lehet létrehozni az igényelt könyvtárat a '%s' kimeneti fájlnak\n" ++msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n" ++msgstr "HIBA: Nem lehet létrehozni az igényelt könyvtárat a '%s' kimeneti fájlnak\n" + +-#: oggenc/oggenc.c:282 ++#: oggenc/oggenc.c:278 + #, c-format + msgid "ERROR: Cannot open output file \"%s\": %s\n" + msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s kimenet fájlt\n" + +-#: oggenc/oggenc.c:312 ++#: oggenc/oggenc.c:308 + #, c-format + msgid "Resampling input from %d Hz to %d Hz\n" + msgstr "" + +-#: oggenc/oggenc.c:319 ++#: oggenc/oggenc.c:315 + msgid "Downmixing stereo to mono\n" + msgstr "" + +-#: oggenc/oggenc.c:322 ++#: oggenc/oggenc.c:318 + msgid "ERROR: Can't downmix except from stereo to mono\n" + msgstr "" + +-#: oggenc/oggenc.c:333 +-#, c-format +-msgid "Scaling input to %f\n" +-msgstr "" +- +-#: oggenc/oggenc.c:377 ++#: oggenc/oggenc.c:365 + #, fuzzy, c-format + msgid "" + "%s%s\n" +@@ -922,31 +892,23 @@ + " -s, --serial Specify a serial number for the stream. If encoding\n" + " multiple files, this will be incremented for each\n" + " stream after the first.\n" +-" --discard-comments Prevents comments in FLAC and Ogg FLAC files from\n" +-" being copied to the output Ogg Vorbis file.\n" + "\n" + " Naming:\n" + " -o, --output=fn Write file to fn (only valid in single-file mode)\n" + " -n, --names=string Produce filenames as this string, with %%a, %%t, %%l,\n" +-" %%n, %%d replaced by artist, title, album, track " +-"number,\n" +-" and date, respectively (see below for specifying " +-"these).\n" ++" %%n, %%d replaced by artist, title, album, track number,\n" ++" and date, respectively (see below for specifying these).\n" + " %%%% gives a literal %%.\n" +-" -X, --name-remove=s Remove the specified characters from parameters to " +-"the\n" ++" -X, --name-remove=s Remove the specified characters from parameters to the\n" + " -n format string. Useful to ensure legal filenames.\n" + " -P, --name-replace=s Replace characters removed by --name-remove with the\n" +-" characters specified. If this string is shorter than " +-"the\n" ++" characters specified. If this string is shorter than the\n" + " --name-remove list or is not specified, the extra\n" + " characters are just removed.\n" +-" Default settings for the above two arguments are " +-"platform\n" ++" Default settings for the above two arguments are platform\n" + " specific.\n" + " -c, --comment=c Add the given string as an extra comment. This may be\n" +-" used multiple times. The argument should be in the\n" +-" format \"tag=value\".\n" ++" used multiple times.\n" + " -d, --date Date for track (usually date of performance)\n" + " -N, --tracknum Track number for this track\n" + " -t, --title Title for this track\n" +@@ -954,34 +916,24 @@ + " -a, --artist Name of artist\n" + " -G, --genre Genre of track\n" + " If multiple input files are given, then multiple\n" +-" instances of the previous five arguments will be " +-"used,\n" ++" instances of the previous five arguments will be used,\n" + " in the order they are given. If fewer titles are\n" +-" specified than files, OggEnc will print a warning, " +-"and\n" ++" specified than files, OggEnc will print a warning, and\n" + " reuse the final one for the remaining files. If fewer\n" + " track numbers are given, the remaining files will be\n" +-" unnumbered. For the others, the final tag will be " +-"reused\n" +-" for all others without warning (so you can specify a " +-"date\n" +-" once, for example, and have it used for all the " +-"files)\n" ++" unnumbered. For the others, the final tag will be reused\n" ++" for all others without warning (so you can specify a date\n" ++" once, for example, and have it used for all the files)\n" + "\n" + "INPUT FILES:\n" +-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or " +-"AIFF/C\n" +-" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. " +-"Files\n" +-" may be mono or stereo (or more channels) and any sample rate.\n" +-" Alternatively, the --raw option may be used to use a raw PCM data file, " +-"which\n" +-" must be 16 bit stereo little-endian PCM ('headerless wav'), unless " +-"additional\n" ++" OggEnc input files must currently be 16 or 8 bit PCM WAV, AIFF, or AIFF/C\n" ++" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n" ++" (or more channels) and any sample rate.\n" ++" Alternatively, the --raw option may be used to use a raw PCM data file, which\n" ++" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n" + " parameters for raw mode are specified.\n" +-" You can specify taking the file from stdin by using - as the input " +-"filename.\n" +-" In this mode, output is to stdout unless an output filename is specified\n" ++" You can specify taking the file from stdin by using - as the input filename.\n" ++" In this mode, output is to stdout unless an outfile filename is specified\n" + " with -o\n" + "\n" + msgstr "" +@@ -992,52 +944,38 @@ + " Általásnos:\n" + " -Q, --quiet Nemír kisemmit az stderr-re\n" + " -h, --help Kiírja ezt a szöveget\n" +-" -r, --raw Nyers mód. A bemeneti fájlt közvetleül mint PCM adat " +-"olvassa\n" +-" -B, --raw-bits=n Beállítja a bitenkénti minta vételezést a nyers " +-"bemenethez. Alapból 16\n" ++" -r, --raw Nyers mód. A bemeneti fájlt közvetleül mint PCM adat olvassa\n" ++" -B, --raw-bits=n Beállítja a bitenkénti minta vételezést a nyers bemenethez. Alapból 16\n" + " -C, --raw-chan=n Beállítja a csatornák számát. Alapbólis 2\n" +-" -R, --raw-rate=n Beállítja a másodpercenkéni mintavételezések számát a " +-"nyers bemenethez. Alapból 44100\n" +-" -b, --bitrate A kódólás átlagos bitrátájának kiválasztása. Ez " +-"használja\n" ++" -R, --raw-rate=n Beállítja a másodpercenkéni mintavételezések számát a nyers bemenethez. Alapból 44100\n" ++" -b, --bitrate A kódólás átlagos bitrátájának kiválasztása. Ez használja\n" + " a kódólás átlagos bitrátájaként. Ez az érték\n" + " kbps-ban értendő.\n" + " -m, --min-bitrate Meghatározza az minimális bitrátát(kbps-ban). Hasznos\n" + " fix méretű csatornáknál.\n" + " -M, --max-bitrate Meghatározza az maximális bitrátát(kbps-ban). Hasznos\n" + " az adatfolyamoknál.\n" +-" -q, --quality A minőség meghatározása 0 (alacsony) és 10 (magas) " +-"között,\n" ++" -q, --quality A minőség meghatározása 0 (alacsony) és 10 (magas) között,\n" + " használhatja a bitráta meghatározás helyett.\n" + " Ez a normális művelet.\n" + " Meghatározhat tört értékeket (pl. 2.75) \n" +-" -s, --serial A folyamat sorozat számának a meghatározása. Ha több " +-"fájlt\n" ++" -s, --serial A folyamat sorozat számának a meghatározása. Ha több fájlt\n" + " kódól akkor ez a szám automatikusan növekszik\n" + " minden folyamat után.\n" + "\n" + " Nevezés:\n" +-" -o, --output=fn Kiírja a fájlt fn névvel (csak egy fájlos módban " +-"használható)\n" +-" -n, --names=sztring Ezzel a sztringgel nevezi el a fájlokat, ahol a %%a " +-"az előadót, %%t a címet\n" +-" %%l az albumot,%%n a sáv számot és a %%d pedig " +-"a dátumot jelenti\n" ++" -o, --output=fn Kiírja a fájlt fn névvel (csak egy fájlos módban használható)\n" ++" -n, --names=sztring Ezzel a sztringgel nevezi el a fájlokat, ahol a %%a az előadót, %%t a címet\n" ++" %%l az albumot,%%n a sáv számot és a %%d pedig a dátumot jelenti\n" + " %%%% %%.\n" +-" -X, --name-remove=s Eltávolítja a meghatározott karakterket a '-n' " +-"formájú\n" +-" sztringekből . Hasznos lehet az érvényes formátumú " +-"fájlnevek létrehozását.\n" +-" -P, --name-replace=s Kicseréli az eltávolított karaktereket amit a --name-" +-"remove-vel\n" ++" -X, --name-remove=s Eltávolítja a meghatározott karakterket a '-n' formájú\n" ++" sztringekből . Hasznos lehet az érvényes formátumú fájlnevek létrehozását.\n" ++" -P, --name-replace=s Kicseréli az eltávolított karaktereket amit a --name-remove-vel\n" + " határozott. Ha a lista rövidebb mint a \n" +-" --name-remove lista vagy nincs meghatározva akkor az " +-"extra\n" ++" --name-remove lista vagy nincs meghatározva akkor az extra\n" + " karaktereket egyszerűen eltávolítja.\n" + " Az alapbeállítások platformfüggő\n" +-" -c, --comment=c A meghatározott sztringek megjegyzésként hozzádja a " +-"fájlhoz. Ezt sok helyen\n" ++" -c, --comment=c A meghatározott sztringek megjegyzésként hozzádja a fájlhoz. Ezt sok helyen\n" + " használható.\n" + " -d, --date A sáv dátumának meghatározása \n" + " -N, --tracknum A sáv számának a meghatározása\n" +@@ -1048,178 +986,144 @@ + " Ha több bementi fájl ad meg akkor az előző öt\n" + " paramétert használja fel,\n" + " Ha kevesebb címet határozz meg\n" +-" mint ahány fájl van akkor az OggEnc egy figyelmezetést " +-"küld\n" +-" és felhasználja az utolsó címet a fájl átnevezésre. Ha " +-"kevesebb\n" ++" mint ahány fájl van akkor az OggEnc egy figyelmezetést küld\n" ++" és felhasználja az utolsó címet a fájl átnevezésre. Ha kevesebb\n" + " sávot ad meg akkor nem fogja számozni a fájlokat.\n" + " Egyébként minden utolsó tagot újra felhasznál\n" +-" minden további figyelmezetés nélkül(pl. így csak " +-"egyszer kell meghatározni a dátumot\n" ++" minden további figyelmezetés nélkül(pl. így csak egyszer kell meghatározni a dátumot\n" + " és az összes fájl ezt használja)\n" + "\n" + "BEMENETI FÁJLOK:\n" +-" Az OggEnc bemeneti fájljai jelenleg 16 vagy 8 bites PCM WAV, AIFF, vagy " +-"AIFF/C\n" +-" fájlok. A fájlok lehetnek monok vagy sztereók (vagy több csatornások) és " +-"bármilyen mintavételezésű.\n" ++" Az OggEnc bemeneti fájljai jelenleg 16 vagy 8 bites PCM WAV, AIFF, vagy AIFF/C\n" ++" fájlok. A fájlok lehetnek monok vagy sztereók (vagy több csatornások) és bármilyen mintavételezésű.\n" + " Habár a kódoló csak 44.1 és 48 kHz működik és minden egyéb\n" + " frekvencia a minőség romlásához vezet.\n" + " Esetleg, a '--raw' opcióval használhat nyers PCM adat fájlokat, amelyek\n" +-" 16 bites sztereó little-endian PCM ('headerless wav') kell lennie, de " +-"semilyen egyéb\n" ++" 16 bites sztereó little-endian PCM ('headerless wav') kell lennie, de semilyen egyéb\n" + " paramétert nem használhat a nyers módban.\n" + " A '-' -el meghatározhatja hogy stdin-t használja mint bemeneti fájlnév.\n" + " Ebben a módban az alapértelemezett kimenet az stdout. A kimeneti fájlt \n" + "a '-o'-val hatázhatja meg\n" + "\n" + +-#: oggenc/oggenc.c:551 ++#: oggenc/oggenc.c:536 + #, c-format + msgid "WARNING: Ignoring illegal escape character '%c' in name format\n" + msgstr "FIGYELEM: Érvénytelen eszkép karakter a '%c' a névben\n" + +-#: oggenc/oggenc.c:577 oggenc/oggenc.c:697 oggenc/oggenc.c:710 ++#: oggenc/oggenc.c:562 oggenc/oggenc.c:670 oggenc/oggenc.c:683 + msgid "Enabling bitrate management engine\n" + msgstr "A bitrára kezelés motor engedélyezése\n" + +-#: oggenc/oggenc.c:586 ++#: oggenc/oggenc.c:571 + #, fuzzy +-msgid "" +-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n" +-msgstr "" +-"FIGYELEM:Nyers csatorna számlálót határozott meg nem nyers adatra. A " +-"bemenetet nyersként használom.\n" ++msgid "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n" ++msgstr "FIGYELEM:Nyers csatorna számlálót határozott meg nem nyers adatra. A bemenetet nyersként használom.\n" + +-#: oggenc/oggenc.c:589 ++#: oggenc/oggenc.c:574 + #, c-format + msgid "WARNING: Couldn't read endianness argument \"%s\"\n" + msgstr "" + +-#: oggenc/oggenc.c:596 ++#: oggenc/oggenc.c:581 + #, c-format + msgid "WARNING: Couldn't read resampling frequency \"%s\"\n" + msgstr "" + +-#: oggenc/oggenc.c:602 ++#: oggenc/oggenc.c:587 + #, c-format + msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n" + msgstr "" + +-#: oggenc/oggenc.c:612 +-#, fuzzy, c-format +-msgid "Warning: Couldn't parse scaling factor \"%s\"\n" +-msgstr "Nem tudom értelmezni a vágásipontot\"%s\"\n" +- +-#: oggenc/oggenc.c:622 ++#: oggenc/oggenc.c:599 + msgid "No value for advanced encoder option found\n" + msgstr "" + +-#: oggenc/oggenc.c:637 ++#: oggenc/oggenc.c:610 + msgid "Internal error parsing command line options\n" + msgstr "Belső hiba a parancs sori opció elemzése során\n" + +-#: oggenc/oggenc.c:648 ++#: oggenc/oggenc.c:621 + #, c-format + msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n" + msgstr "" + +-#: oggenc/oggenc.c:683 ++#: oggenc/oggenc.c:656 + #, c-format + msgid "Warning: nominal bitrate \"%s\" not recognised\n" + msgstr "Figyelmeztetés: névleges \"%s\" nem értelmezhető\n" + +-#: oggenc/oggenc.c:691 ++#: oggenc/oggenc.c:664 + #, c-format + msgid "Warning: minimum bitrate \"%s\" not recognised\n" + msgstr "Figyelmeztetés: minimális \"%s\" nem értelmezhető\n" + +-#: oggenc/oggenc.c:704 ++#: oggenc/oggenc.c:677 + #, c-format + msgid "Warning: maximum bitrate \"%s\" not recognised\n" + msgstr "Figyelmeztetés: maximális \"%s\" nem értelmezhető\n" + +-#: oggenc/oggenc.c:716 ++#: oggenc/oggenc.c:689 + #, c-format + msgid "Quality option \"%s\" not recognised, ignoring\n" + msgstr "Minőség opciók \"%s\" nem értelmezhető\n" + +-#: oggenc/oggenc.c:724 ++#: oggenc/oggenc.c:697 + msgid "WARNING: quality setting too high, setting to maximum quality.\n" +-msgstr "" +-"FIGYELEM: a minőség túl magasra lett állítva, a maximálisra beállítva.\n" ++msgstr "FIGYELEM: a minőség túl magasra lett állítva, a maximálisra beállítva.\n" + +-#: oggenc/oggenc.c:730 ++#: oggenc/oggenc.c:703 + msgid "WARNING: Multiple name formats specified, using final\n" +-msgstr "" +-"FIGYELEM: Többszörös név formátumot hatázott meg, az utolsót használom\n" ++msgstr "FIGYELEM: Többszörös név formátumot hatázott meg, az utolsót használom\n" + +-#: oggenc/oggenc.c:739 ++#: oggenc/oggenc.c:712 + msgid "WARNING: Multiple name format filters specified, using final\n" +-msgstr "" +-"FIGYELEM: Többszörös név formátum szűröt hatázott meg, az utolsót használom\n" ++msgstr "FIGYELEM: Többszörös név formátum szűröt hatázott meg, az utolsót használom\n" + +-#: oggenc/oggenc.c:748 +-msgid "" +-"WARNING: Multiple name format filter replacements specified, using final\n" +-msgstr "" +-"FIGYELEM: Többszörös név formátum szűrő cserét hatázott meg, az utolsót " +-"használom\n" ++#: oggenc/oggenc.c:721 ++msgid "WARNING: Multiple name format filter replacements specified, using final\n" ++msgstr "FIGYELEM: Többszörös név formátum szűrő cserét hatázott meg, az utolsót használom\n" + +-#: oggenc/oggenc.c:756 ++#: oggenc/oggenc.c:729 + msgid "WARNING: Multiple output files specified, suggest using -n\n" + msgstr "FIGYELEM: Több kimeneti fájlt hatázott meg használja a '-n'-t\n" + +-#: oggenc/oggenc.c:775 +-msgid "" +-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n" +-msgstr "" +-"FIGYELEM:Nyers bitmintát határozott meg nem nyers adatra. A bemenetet " +-"nyersként használom.\n" ++#: oggenc/oggenc.c:748 ++msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n" ++msgstr "FIGYELEM:Nyers bitmintát határozott meg nem nyers adatra. A bemenetet nyersként használom.\n" + + #. Failed, so just set to 16 +-#: oggenc/oggenc.c:780 oggenc/oggenc.c:784 ++#: oggenc/oggenc.c:753 oggenc/oggenc.c:757 + msgid "WARNING: Invalid bits/sample specified, assuming 16.\n" +-msgstr "" +-"FIGYELEM: Érénytelen mintavételezést határozott meg, 16-ost használom.\n" ++msgstr "FIGYELEM: Érénytelen mintavételezést határozott meg, 16-ost használom.\n" + +-#: oggenc/oggenc.c:791 +-msgid "" +-"WARNING: Raw channel count specified for non-raw data. Assuming input is " +-"raw.\n" +-msgstr "" +-"FIGYELEM:Nyers csatorna számlálót határozott meg nem nyers adatra. A " +-"bemenetet nyersként használom.\n" ++#: oggenc/oggenc.c:764 ++msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n" ++msgstr "FIGYELEM:Nyers csatorna számlálót határozott meg nem nyers adatra. A bemenetet nyersként használom.\n" + + #. Failed, so just set to 2 +-#: oggenc/oggenc.c:796 ++#: oggenc/oggenc.c:769 + msgid "WARNING: Invalid channel count specified, assuming 2.\n" +-msgstr "" +-"FIGYELEM: Érvénytelen csatorna számlálót határozott meg, 2-est használom.\n" ++msgstr "FIGYELEM: Érvénytelen csatorna számlálót határozott meg, 2-est használom.\n" + +-#: oggenc/oggenc.c:807 +-msgid "" +-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n" +-msgstr "" +-"FIGYELEM:Nyers mintavételezést határozott meg nem nyers adatra. A bemenetet " +-"nyersként használom.\n" ++#: oggenc/oggenc.c:780 ++msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n" ++msgstr "FIGYELEM:Nyers mintavételezést határozott meg nem nyers adatra. A bemenetet nyersként használom.\n" + + #. Failed, so just set to 44100 +-#: oggenc/oggenc.c:812 ++#: oggenc/oggenc.c:785 + msgid "WARNING: Invalid sample rate specified, assuming 44100.\n" +-msgstr "" +-"FIGYELEM: Événytelen mintavételezést határott meg 44100-at használom.\n" ++msgstr "FIGYELEM: Événytelen mintavételezést határott meg 44100-at használom.\n" + +-#: oggenc/oggenc.c:816 ++#: oggenc/oggenc.c:789 + msgid "WARNING: Unknown option specified, ignoring->\n" + msgstr "FIGYELEM Ismeretlen opciót határozott meg, elutasítva->\n" + +-#: oggenc/oggenc.c:838 ++#: oggenc/oggenc.c:811 + msgid "Couldn't convert comment to UTF-8, cannot add\n" +-msgstr "" +-"Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n" ++msgstr "Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n" + +-#: oggenc/oggenc.c:857 ++#: oggenc/oggenc.c:830 + msgid "WARNING: Insufficient titles specified, defaulting to final title.\n" + msgstr "FIGYELEM: Kevés címet adott meg, az utolsó címet használom.\n" + +@@ -1238,268 +1142,221 @@ + msgid "Error: path segment \"%s\" is not a directory\n" + msgstr "Hiba: az útvonal \"%s\" része nem könyvtár\n" + +-#: ogginfo/ogginfo2.c:159 ++#: ogginfo/ogginfo2.c:156 + #, c-format +-msgid "" +-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n" ++msgid "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:166 ++#: ogginfo/ogginfo2.c:164 + #, c-format +-msgid "" +-"Warning: Vorbis stream %d does not have headers correctly framed. Terminal " +-"header page contains additional packets or has non-zero granulepos\n" ++msgid "Warning: Vorbis stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:170 ++#: ogginfo/ogginfo2.c:168 + #, c-format + msgid "Vorbis headers parsed for stream %d, information follows...\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:173 ++#: ogginfo/ogginfo2.c:171 + #, fuzzy, c-format + msgid "Version: %d\n" + msgstr "Verzió: %s" + +-#: ogginfo/ogginfo2.c:177 ++#: ogginfo/ogginfo2.c:175 + #, fuzzy, c-format + msgid "Vendor: %s (%s)\n" + msgstr "forgalmazó=%s\n" + +-#: ogginfo/ogginfo2.c:184 ++#: ogginfo/ogginfo2.c:182 + #, fuzzy, c-format + msgid "Vendor: %s\n" + msgstr "forgalmazó=%s\n" + +-#: ogginfo/ogginfo2.c:185 ++#: ogginfo/ogginfo2.c:183 + #, c-format + msgid "Channels: %d\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:186 ++#: ogginfo/ogginfo2.c:184 + #, fuzzy, c-format + msgid "" + "Rate: %ld\n" + "\n" + msgstr "Dátum: %s" + +-#: ogginfo/ogginfo2.c:189 ++#: ogginfo/ogginfo2.c:187 + #, fuzzy, c-format + msgid "Nominal bitrate: %f kb/s\n" + msgstr "" + "\tÁtlagos bitráta: %.1f kb/s\n" + "\n" + +-#: ogginfo/ogginfo2.c:192 ++#: ogginfo/ogginfo2.c:190 + #, fuzzy + msgid "Nominal bitrate not set\n" + msgstr "Figyelmeztetés: névleges \"%s\" nem értelmezhető\n" + +-#: ogginfo/ogginfo2.c:195 ++#: ogginfo/ogginfo2.c:193 + #, fuzzy, c-format + msgid "Upper bitrate: %f kb/s\n" + msgstr "" + "\tÁtlagos bitráta: %.1f kb/s\n" + "\n" + +-#: ogginfo/ogginfo2.c:198 ++#: ogginfo/ogginfo2.c:196 + msgid "Upper bitrate not set\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:201 ++#: ogginfo/ogginfo2.c:199 + #, fuzzy, c-format + msgid "Lower bitrate: %f kb/s\n" + msgstr "" + "\tÁtlagos bitráta: %.1f kb/s\n" + "\n" + +-#: ogginfo/ogginfo2.c:204 ++#: ogginfo/ogginfo2.c:202 + msgid "Lower bitrate not set\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:207 ++#: ogginfo/ogginfo2.c:205 + msgid "User comments section follows...\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:219 ++#: ogginfo/ogginfo2.c:217 + #, c-format +-msgid "" +-"Warning: Comment %d in stream %d is invalidly formatted, does not contain " +-"'=': \"%s\"\n" ++msgid "Warning: Comment %d in stream %d is invalidly formatted, does not contain '=': \"%s\"\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:228 ++#: ogginfo/ogginfo2.c:226 + #, c-format + msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:259 ogginfo/ogginfo2.c:268 ++#: ogginfo/ogginfo2.c:257 ogginfo/ogginfo2.c:266 + #, c-format +-msgid "" +-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker " +-"wrong\n" ++msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:276 ++#: ogginfo/ogginfo2.c:274 + #, c-format +-msgid "" +-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n" ++msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:337 ++#: ogginfo/ogginfo2.c:335 + #, c-format +-msgid "" +-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n" ++msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:349 ++#: ogginfo/ogginfo2.c:347 + msgid "Warning: Failure in utf8 decoder. This should be impossible\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:367 +-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d" +-msgstr "" +- +-#: ogginfo/ogginfo2.c:370 ++#: ogginfo/ogginfo2.c:364 + #, c-format +-msgid "Warning: granulepos in stream %d decreases from %lld to %lld" ++msgid "Warning: granulepos in stream %d decreases from " + msgstr "" + +-#: ogginfo/ogginfo2.c:376 +-msgid "" +-"Negative granulepos on vorbis stream outside of headers. This file was " +-"created by a buggy encoder\n" ++#: ogginfo/ogginfo2.c:365 ++msgid " to " + msgstr "" + +-#: ogginfo/ogginfo2.c:397 +-msgid "" +-"Vorbis stream %d:\n" +-"\tTotal data length: %I64d bytes\n" +-"\tPlayback length: %ldm:%02lds\n" +-"\tAverage bitrate: %f kbps\n" ++#: ogginfo/ogginfo2.c:365 ++msgid "\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:403 ++#: ogginfo/ogginfo2.c:384 + #, c-format + msgid "" + "Vorbis stream %d:\n" +-"\tTotal data length: %lld bytes\n" ++"\tTotal data length: %ld bytes\n" + "\tPlayback length: %ldm:%02lds\n" + "\tAverage bitrate: %f kbps\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:438 ++#: ogginfo/ogginfo2.c:418 + #, c-format + msgid "Warning: EOS not set on stream %d\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:562 ++#: ogginfo/ogginfo2.c:537 + msgid "Warning: Invalid header page, no packet found\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:574 ++#: ogginfo/ogginfo2.c:549 + #, c-format + msgid "Warning: Invalid header page in stream %d, contains multiple packets\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:588 +-#, c-format +-msgid "" +-"Note: Stream %d has serial number %d, which is legal but may cause problems " +-"with some tools." +-msgstr "" +- +-#: ogginfo/ogginfo2.c:605 +-msgid "" +-"Warning: Hole in data found at approximate offset %I64d bytes. Corrupted " +-"ogg.\n" ++#: ogginfo/ogginfo2.c:574 ++msgid "Warning: Hole in data found at approximate offset " + msgstr "" + +-#: ogginfo/ogginfo2.c:607 +-#, c-format +-msgid "" +-"Warning: Hole in data found at approximate offset %lld bytes. Corrupted " +-"ogg.\n" ++#: ogginfo/ogginfo2.c:575 ++msgid " bytes. Corrupted ogg.\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:632 ++#: ogginfo/ogginfo2.c:599 + #, fuzzy, c-format + msgid "Error opening input file \"%s\": %s\n" + msgstr "Hiba a '%s' bemeneti fájl megnyitása során.\n" + +-#: ogginfo/ogginfo2.c:637 ++#: ogginfo/ogginfo2.c:604 + #, fuzzy, c-format + msgid "" + "Processing file \"%s\"...\n" + "\n" + msgstr "Feldolgozás sikertelen\n" + +-#: ogginfo/ogginfo2.c:646 ++#: ogginfo/ogginfo2.c:613 + #, fuzzy + msgid "Could not find a processor for stream, bailing\n" + msgstr "A '%s'-t nem lehet megnyitni olvasásra\n" + +-#: ogginfo/ogginfo2.c:654 +-msgid "Page found for stream after EOS flag" +-msgstr "" +- +-#: ogginfo/ogginfo2.c:657 +-msgid "" +-"Ogg muxing constraints violated, new stream before EOS of all previous " +-"streams" +-msgstr "" +- +-#: ogginfo/ogginfo2.c:661 +-msgid "Error unknown." +-msgstr "" +- +-#: ogginfo/ogginfo2.c:664 ++#: ogginfo/ogginfo2.c:618 + #, c-format + msgid "" + "Warning: illegally placed page(s) for logical stream %d\n" +-"This indicates a corrupt ogg file: %s.\n" ++"This indicates a corrupt ogg file.\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:676 ++#: ogginfo/ogginfo2.c:625 + #, c-format + msgid "New logical stream (#%d, serial: %08x): type %s\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:679 ++#: ogginfo/ogginfo2.c:628 + #, fuzzy, c-format + msgid "Warning: stream start flag not set on stream %d\n" + msgstr "Figyelmeztetés: maximális \"%s\" nem értelmezhető\n" + +-#: ogginfo/ogginfo2.c:683 ++#: ogginfo/ogginfo2.c:632 + #, c-format + msgid "Warning: stream start flag found in mid-stream on stream %d\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:688 ++#: ogginfo/ogginfo2.c:637 + #, c-format +-msgid "" +-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %" +-"ld. Indicates missing data.\n" ++msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:703 ++#: ogginfo/ogginfo2.c:652 + #, c-format + msgid "Logical stream %d ended\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:711 ++#: ogginfo/ogginfo2.c:659 + #, c-format + msgid "" + "Error: No ogg data found in file \"%s\".\n" + "Input probably not ogg.\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:722 ++#: ogginfo/ogginfo2.c:670 + msgid "" + "ogginfo 1.0\n" +-"(c) 2002 Michael Smith \n" ++"(c) 2002 Michael Smith \n" + "\n" +-"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n" ++"Usage: ogginfo [flags] files1.ogg [file2.ogg ... fileN.ogg]\n" + "Flags supported:\n" + "\t-h Show this help message\n" + "\t-q Make less verbose. Once will remove detailed informative\n" +@@ -1509,7 +1366,7 @@ + "\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:743 ++#: ogginfo/ogginfo2.c:691 + msgid "" + "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n" + "\n" +@@ -1518,7 +1375,7 @@ + "Full help shown with \"ogginfo -h\".\n" + msgstr "" + +-#: ogginfo/ogginfo2.c:772 ++#: ogginfo/ogginfo2.c:720 + #, fuzzy + msgid "No input files specified. \"ogginfo -h\" for help\n" + msgstr "" +@@ -1584,27 +1441,27 @@ + msgid "%s: option `-W %s' doesn't allow an argument\n" + msgstr "%s: a `-W %s' kapcsoló nem enged meg argumentumot\n" + +-#: vcut/vcut.c:133 ++#: vcut/vcut.c:131 + msgid "Page error. Corrupt input.\n" + msgstr "Lap hiba. Sérült bemenet.\n" + +-#: vcut/vcut.c:150 ++#: vcut/vcut.c:148 + msgid "Bitstream error, continuing\n" + msgstr "Bitfolyamat hiba, folyatatás\n" + +-#: vcut/vcut.c:175 ++#: vcut/vcut.c:173 + msgid "Found EOS before cut point.\n" + msgstr "EOS-t találtam a kivágási pont előtt.\n" + +-#: vcut/vcut.c:184 ++#: vcut/vcut.c:182 + msgid "Setting eos: update sync returned 0\n" + msgstr "EOS beállítás: szinkronizálás 0-val tért vissza\n" + +-#: vcut/vcut.c:194 ++#: vcut/vcut.c:192 + msgid "Cutpoint not within stream. Second file will be empty\n" + msgstr "Nincs kivágási pont az adatfolyamban. A második fájl üres lesz\n" + +-#: vcut/vcut.c:227 ++#: vcut/vcut.c:225 + msgid "Unhandled special case: first file too short?\n" + msgstr "Kezelhetlen speciális eset: az első fájl túl rövid?\n" + +@@ -1612,7 +1469,7 @@ + #. * spectacularly unlucky? Doubt it, but let's check for it just + #. * in case. + #. +-#: vcut/vcut.c:286 ++#: vcut/vcut.c:284 + msgid "" + "ERROR: First two audio packets did not fit into one\n" + " ogg page. File may not decode correctly.\n" +@@ -1620,49 +1477,47 @@ + "HIBA: Az első két audio csomagot nem lehet egy\n" + " ogg lapra helyezni. A fájl visszakódólás nem helyes.\n" + +-#: vcut/vcut.c:299 ++#: vcut/vcut.c:297 + msgid "Recoverable bitstream error\n" + msgstr "Helyrehozható adatfolyam hiba\n" + +-#: vcut/vcut.c:309 ++#: vcut/vcut.c:307 + msgid "Bitstream error\n" + msgstr "Adatfolyam hiba\n" + +-#: vcut/vcut.c:332 ++#: vcut/vcut.c:330 + msgid "Update sync returned 0, setting eos\n" + msgstr "A szinkronizálás 0-val tért vissza, EOS beállítása\n" + +-#: vcut/vcut.c:381 ++#: vcut/vcut.c:376 + msgid "Input not ogg.\n" + msgstr "A bemenet nem ogg.\n" + +-#: vcut/vcut.c:391 ++#: vcut/vcut.c:386 + msgid "Error in first page\n" + msgstr "Hiba első oldalon\n" + +-#: vcut/vcut.c:396 ++#: vcut/vcut.c:391 + msgid "error in first packet\n" + msgstr "hiba az első csomagban\n" + +-#: vcut/vcut.c:402 ++#: vcut/vcut.c:397 + msgid "Error in primary header: not vorbis?\n" + msgstr "Hiba az elsődleges fejlécben: lehet, hogy nem vorbis?\n" + +-#: vcut/vcut.c:422 ++#: vcut/vcut.c:417 + msgid "Secondary header corrupt\n" + msgstr "Másodlagos fejléc sérült\n" + +-#: vcut/vcut.c:435 ++#: vcut/vcut.c:430 + msgid "EOF in headers\n" + msgstr "Fájl vég jel a fejlécben\n" + +-#: vcut/vcut.c:468 +-#, fuzzy +-msgid "" +-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n" ++#: vcut/vcut.c:456 ++msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n" + msgstr "Használat: vcut befájl.ogg kifájl1.ogg kifájl2.ogg vágásipont\n" + +-#: vcut/vcut.c:472 ++#: vcut/vcut.c:460 + msgid "" + "WARNING: vcut is still experimental code.\n" + "Check that the output files are correct before deleting sources.\n" +@@ -1672,85 +1527,77 @@ + " Ellenőrizze a kimeneti fájl helyeséges mielőtt letörli az eredetit\n" + "\n" + +-#: vcut/vcut.c:477 ++#: vcut/vcut.c:465 + #, c-format + msgid "Couldn't open %s for reading\n" + msgstr "A '%s'-t nem lehet megnyitni olvasásra\n" + +-#: vcut/vcut.c:482 vcut/vcut.c:487 ++#: vcut/vcut.c:470 vcut/vcut.c:475 + #, c-format + msgid "Couldn't open %s for writing\n" + msgstr "A '%s'-t nem lehet megnyitni írásra\n" + +-#: vcut/vcut.c:493 vcut/vcut.c:498 ++#: vcut/vcut.c:480 + #, c-format + msgid "Couldn't parse cutpoint \"%s\"\n" + msgstr "Nem tudom értelmezni a vágásipontot\"%s\"\n" + +-#: vcut/vcut.c:503 +-#, fuzzy, c-format +-msgid "Processing: Cutting at %lld seconds\n" +-msgstr "Feldolgozás: Vágás a %lld -nél\n" +- +-#: vcut/vcut.c:505 +-#, fuzzy, c-format +-msgid "Processing: Cutting at %lld samples\n" ++#: vcut/vcut.c:484 ++#, c-format ++msgid "Processing: Cutting at %lld\n" + msgstr "Feldolgozás: Vágás a %lld -nél\n" + +-#: vcut/vcut.c:515 ++#: vcut/vcut.c:493 + msgid "Processing failed\n" + msgstr "Feldolgozás sikertelen\n" + +-#: vcut/vcut.c:537 ++#: vcut/vcut.c:514 + msgid "Error reading headers\n" + msgstr "Hiba a fejléc olvasása közben\n" + +-#: vcut/vcut.c:560 ++#: vcut/vcut.c:537 + msgid "Error writing first output file\n" + msgstr "Hiba az első kimeneti fájl írása közben\n" + +-#: vcut/vcut.c:568 ++#: vcut/vcut.c:545 + msgid "Error writing second output file\n" + msgstr "Hiba az második kimeneti fájl írása közben\n" + +-#: vorbiscomment/vcedit.c:229 ++#: vorbiscomment/vcedit.c:220 + msgid "Input truncated or empty." + msgstr "A bemenet megcsonkított vagy üres." + +-#: vorbiscomment/vcedit.c:231 ++#: vorbiscomment/vcedit.c:222 + msgid "Input is not an Ogg bitstream." + msgstr "A bemenet nem Ogg adatfolyam." + +-#: vorbiscomment/vcedit.c:249 ++#: vorbiscomment/vcedit.c:239 + msgid "Error reading first page of Ogg bitstream." + msgstr "Hiba az első oldal Ogg adatfolyam olvasása közben." + +-#: vorbiscomment/vcedit.c:255 ++#: vorbiscomment/vcedit.c:245 + msgid "Error reading initial header packet." + msgstr "Hiba a kezdő fejléc csomag olvasása közben." + +-#: vorbiscomment/vcedit.c:261 ++#: vorbiscomment/vcedit.c:251 + msgid "Ogg bitstream does not contain vorbis data." + msgstr "Ogg adatfolyam nem tartalmaz vorbis adatokat." + +-#: vorbiscomment/vcedit.c:284 ++#: vorbiscomment/vcedit.c:274 + msgid "Corrupt secondary header." + msgstr "Sérült másodlagos fejléc." + +-#: vorbiscomment/vcedit.c:305 ++#: vorbiscomment/vcedit.c:295 + msgid "EOF before end of vorbis headers." + msgstr "Fájl vég jel a vorbis fejléc vége előtt." + +-#: vorbiscomment/vcedit.c:458 ++#: vorbiscomment/vcedit.c:448 + msgid "Corrupt or missing data, continuing..." + msgstr "Sérült vagy hiányzó adatok, folytatás..." + +-#: vorbiscomment/vcedit.c:495 +-msgid "" +-"Error writing stream to output. Output stream may be corrupted or truncated." +-msgstr "" +-"Hiba az adatfolyam írása közben. A kimeneti adatfolyam lehet hogy sérült " +-"vagy megcsonkított." ++#: vorbiscomment/vcedit.c:487 ++msgid "Error writing stream to output. Output stream may be corrupted or truncated." ++msgstr "Hiba az adatfolyam írása közben. A kimeneti adatfolyam lehet hogy sérült vagy megcsonkított." + + #: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129 + #, c-format +@@ -1779,8 +1626,7 @@ + + #: vorbiscomment/vcomment.c:269 + msgid "Couldn't convert comment to UTF8, cannot add\n" +-msgstr "" +-"Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n" ++msgstr "Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n" + + #: vorbiscomment/vcomment.c:287 + #, fuzzy +@@ -1832,43 +1678,40 @@ + msgid "Internal error parsing command options\n" + msgstr "Belső hiba a parancs opciójának az értelmezése során\n" + +-#: vorbiscomment/vcomment.c:457 ++#: vorbiscomment/vcomment.c:456 + #, c-format + msgid "Error opening input file '%s'.\n" + msgstr "Hiba a '%s' bemeneti fájl megnyitása során.\n" + +-#: vorbiscomment/vcomment.c:466 ++#: vorbiscomment/vcomment.c:465 + msgid "Input filename may not be the same as output filename\n" + msgstr "" + +-#: vorbiscomment/vcomment.c:477 ++#: vorbiscomment/vcomment.c:476 + #, c-format + msgid "Error opening output file '%s'.\n" + msgstr "Hiba a '%s' kimeneti fájl megnyitása során.\n" + +-#: vorbiscomment/vcomment.c:492 ++#: vorbiscomment/vcomment.c:491 + #, c-format + msgid "Error opening comment file '%s'.\n" + msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n" + +-#: vorbiscomment/vcomment.c:509 ++#: vorbiscomment/vcomment.c:508 + #, c-format + msgid "Error opening comment file '%s'\n" + msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n" + +-#: vorbiscomment/vcomment.c:537 ++#: vorbiscomment/vcomment.c:536 + #, fuzzy, c-format + msgid "Error removing old file %s\n" + msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n" + +-#: vorbiscomment/vcomment.c:539 ++#: vorbiscomment/vcomment.c:538 + #, fuzzy, c-format + msgid "Error renaming %s to %s\n" + msgstr "Hiba a fejléc olvasása közben\n" + +-#~ msgid "malloc" +-#~ msgstr "malloc" +- + #~ msgid "Internal error: long option given when none expected.\n" + #~ msgstr "Belső hiba: hosszú opciót használt amikor nem azt vártam.\n" + +@@ -1884,9 +1727,6 @@ + #~ msgid "Title: %s" + #~ msgstr "Cím: %s" + +-#~ msgid "Track number: %s" +-#~ msgstr "Sáv szám: %s" +- + #~ msgid "Organization: %s" + #~ msgstr "Szervezet: %s" + +@@ -1899,29 +1739,18 @@ + #~ msgid "Location: %s" + #~ msgstr "Helyszín: %s" + +-#~ msgid "Copyright %s" +-#~ msgstr "Copyright %s" +- +-#~ msgid "Comment: %s" +-#~ msgstr "Megjegyzés: %s" +- +-#~ msgid "Version is %d" +-#~ msgstr "Verzió: %d" +- + #~ msgid "" + #~ "Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n" + #~ " At other than 44.1/48 kHz quality will be degraded.\n" + #~ msgstr "" +-#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f " +-#~ "kHz).\n" ++#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f kHz).\n" + #~ " Minden 44.1/48 kHz-től eltérő frekvencia a minőség romlásához vezethet.\n" + + #~ msgid "" + #~ "Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n" + #~ " At other than 44.1/48 kHz quality will be significantly degraded.\n" + #~ msgstr "" +-#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f " +-#~ "kHz).\n" ++#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f kHz).\n" + #~ " Minden 44.1/48 kHz-től eltérő frekvencia a minőség romlásához vezethet.\n" + + #~ msgid "" +@@ -1944,16 +1773,13 @@ + #~ "Javaslom hogy CSAK végszükség esetén használja\n" + #~ "(pl. bizonyos audio folyam alkalmazásoknál).\n" + #~ "A bitráta kezelő motor általában minőség romláshoz vezet,\n" +-#~ "használja a normális VBR módokat (a minőséget a '-q'val határozhatja " +-#~ "meg) \n" ++#~ "használja a normális VBR módokat (a minőséget a '-q'val határozhatja meg) \n" + #~ "nagyon ajánlott, hogy értse a dolgát.\n" + #~ "A -managed opció használata kötelező lesz a következő kiadásban.\n" + #~ "\n" + + #~ msgid "WARNING: negative quality specified, setting to minimum.\n" +-#~ msgstr "" +-#~ "FIGYELEM: a minőség túl alacsonyra lett állítva, a minimálisra " +-#~ "beállítva.\n" ++#~ msgstr "FIGYELEM: a minőség túl alacsonyra lett állítva, a minimálisra beállítva.\n" + + #~ msgid "Usage: %s [filename1.ogg] ... [filenameN.ogg]\n" + #~ msgstr "Használat: %s [fájlnév1.ogg] ... [fájlnévN.ogg]\n" --- vorbis-tools-1.1.1.orig/debian/extra/vorbistagedit +++ vorbis-tools-1.1.1/debian/extra/vorbistagedit @@ -0,0 +1,172 @@ +#!/bin/sh -eu + +# vorbistagedit -- allows batch editing of vorbis comments with an editor +# +# Copyright © martin f. krafft +# Released under the terms of the Artistic Licence 2.0 +# + +VERSION=0.5 +ME=${0##*/} + +versioninfo() { + echo "vorbistagedit $VERSION" >&2 + echo "\$Id$" >&2 + echo "$ME is copyright © martin f. krafft" >&2 + echo Released under the terms of the Artistic Licence 2.0 >&2 +} + +usage() { + versioninfo + echo + echo Usage: $ME file1.ogg [file2.ogg [file3.ogg ...]] >&2 + echo + echo If no filenames are given, the list of filenames >&2 + echo is read from stdin, one per line. >&2 +} + +for opt in $(getopt -n $ME -l version,help -o Vh? -- $@); do + case $opt in + --version|-V) + versioninfo + exit 0;; + --help|-h|-\?) + usage + exit 0;; + --) :;; + -*) + echo "E: $ME: invalid argument: $opt" >&2 + exit 1;; + *) :;; + esac +done + +if ! command -v vorbiscomment >/dev/null; then + echo "E: $ME: vorbiscomment not found in \$PATH." >&2 + exit -1 +fi + +old_IFS="$IFS" +IFS=" +" +[ $# -eq 0 ] && set -- $(cat) +IFS="$old_IFS" + +if [ $# -eq 0 ]; then + exit 0 +fi + +TMPFILE=$(mktemp /tmp/vorbistagedit.XXXXXX) +trap "rm -f $TMPFILE" 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + +cat <<_eof > $TMPFILE +# vorbistagedit (\$Id$) +# +# Edit the lines in this file to your desire, but +# DO NOT touch lines starting with a colon (:)! +# You may use lines starting with a plus (+) to rename files. +# +# We are in directory: +# $(pwd) + +_eof + +for i in "$@"; do + case "$i" in + *.ogg) + if [ ! -r "$i" ]; then + echo "E: $ME: unreadable file: $i" >&2 + exit 2 + fi + + if [ ! -w "$i" ]; then + echo "E: $ME: unwriteable file: $i" >&2 + exit 3 + fi + + echo ": $i" + echo "+ $i" + vorbiscomment -l "$i" + echo + ;; + + *) + echo "E: $ME: invalid argument: $i" >&2 + exit 1 + ;; + esac +done >> $TMPFILE +echo : EOF >> $TMPFILE + +MD5SUM=$(md5sum $TMPFILE) + +[ -n "${DISPLAY:-}" ] && [ -n "${VISUAL:-}" ] && EDITOR="$VISUAL" +if [ -z "${EDITOR:-}" ]; then + for i in sensible-editor editor vim emacs nano vi; do + P="$(command -v $i)" + [ -x "$P" ] && EDITOR="$P" && break + done +fi + +if [ -z "${EDITOR}" ]; then + echo "E: $ME: no editor found." >&2 + exit 4 +fi + +eval $EDITOR $TMPFILE + +if echo "$MD5SUM" | md5sum -c >/dev/null 2>&1; then + echo "I: $ME: no changes, exiting..." >&2 + exit 0 +fi + +tags='' + +echo "I: processing files..." >&2 + +write_tags() { + echo -n "I: processing $file... " >&2 + local file="$1"; shift + for tag; do echo "$tag"; done | vorbiscomment -w "$file" + if [ -n "${filename_new:-}" ] && [ "${filename_new:-}" != "$file" ]; then + echo; echo -n "I: renaming to $filename_new... " >&2 + mv "$file" "$filename_new" + unset filename_new + fi +} + +filename_new= + +while read line; do + case "$line" in + ': EOF') + write_tags "$file" "$tags" + echo "done." >&2 + ;; + + :*) + if [ -n "${file:-}" ]; then + write_tags "$file" "$tags" + echo "done." >&2 + tags='' + fi + file="${line#: }" + ;; + + +*) + filename_new="${line#* }";; + + *=*) + tags="${tags:+$tags +}$line";; + + *|'#*') :;; + esac +done < $TMPFILE + +echo "I: done." >&2 + +rm -f $TMPFILE +trap - 0 + +exit 0 --- vorbis-tools-1.1.1.orig/debian/extra/vorbistagedit.1 +++ vorbis-tools-1.1.1/debian/extra/vorbistagedit.1 @@ -0,0 +1,59 @@ +.TH "VORBISTAGEDIT" "1" "2006-11-17" "1.1.1" "VORBIS-TOOLS" + +.SH "NAME" +vorbistagedit \- allows batch editing of vorbis comments with an editor + +.SH "SYNOPSIS" +.B vorbistagedit +.I file1.ogg +.BI [ \|file2.ogg \ \|[ \|file3.ogg\ ... \|] \| ] +.PP +.B vorbistagedit +.BR [ \|--version | \-V | \-v\| ] +.PP +.B vorbistagedit +.BR [ \|--help | \-h\| ] + + + + +.SH "DESCRIPTION" + +.B vorbistagedit +allows batch editing of vorbis comments with an editor.\ If more than one OGG +Vorbis file is specified, +.B vorbistagedit +opens a unique editor for all files given. + + + +.SH "OPTIONS" + +.TP +.B "\-v, \-V, \-\-version " +Show the version of +.BR vorbistagedit "." + + +.TP +.B "\-h, \-\-help " +Show a short help message. + +.SH "SEE ALSO" +.IR vorbiscomment (1), +.IR ogginfo (1) + +.SH "ENVIRONMENT" +.TP +.B EDITOR +Defines the default editor.\ If it's not defined, then +.IR sensible-editor (1) +is used. + +.SH "AUTHOR" +.B vorbistagedit +was written by Martin F. Krafft . + +.PP +This manual page was written by Francois Wendling for the +Debian project (but may be used by others). --- vorbis-tools-1.1.1.orig/debian/vorbis-tools.install +++ vorbis-tools-1.1.1/debian/vorbis-tools.install @@ -0,0 +1,9 @@ +debian/tmp/usr/bin/ogg123 +debian/tmp/usr/bin/oggdec +debian/tmp/usr/bin/oggenc +debian/tmp/usr/bin/ogginfo +debian/tmp/usr/bin/vcut +debian/tmp/usr/bin/vorbiscomment +debian/tmp/usr/share/locale/* + +debian/extra/vorbistagedit usr/bin --- vorbis-tools-1.1.1.orig/debian/vorbis-tools.README.Debian +++ vorbis-tools-1.1.1/debian/vorbis-tools.README.Debian @@ -0,0 +1,6 @@ +vorbis-tools for Debian +----------------------- + +Copy examples/ogg123rc-example to /etc/ogg123rc or ~/.ogg123rc + + -- Christopher L Cheney , Tue, 31 Oct 2000 16:38:42 -0600 --- vorbis-tools-1.1.1.orig/debian/vorbis-tools.examples +++ vorbis-tools-1.1.1/debian/vorbis-tools.examples @@ -0,0 +1 @@ +ogg123/ogg123rc-example --- vorbis-tools-1.1.1.orig/debian/rules +++ vorbis-tools-1.1.1/debian/rules @@ -0,0 +1,129 @@ +#! /usr/bin/make -f + +### + +# Configure arguments + +confflags = --prefix=/usr --enable-vcut + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +confflags += --build $(DEB_BUILD_GNU_TYPE) + +# Only specify --host when cross-compiling +ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --host $(DEB_HOST_GNU_TYPE) +endif + +### + +# Directory to make the build on + +objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE) + +### + +# CFLAGS + +CFLAGS = -Wall -g -I/usr/include/speex + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +### + +# tmp fix for #359068 while upstream accepts our patch to configure.ac +CFLAGS += -D_FILE_OFFSET_BITS=64 + +### + +configure: configure-stamp +configure-stamp: + dh_testdir + + ln -sf /usr/share/misc/config.sub . + ln -sf /usr/share/misc/config.guess . + + ln -sf debian/patches + quilt push -a || test $$? = 2 + + -mkdir $(objdir) + cd $(objdir) && \ + env CFLAGS="$(CFLAGS)" ../configure $(confflags) + + touch $@ + +# + +build: build-stamp +build-stamp: configure-stamp + cd $(objdir) && \ + $(MAKE) + + touch $@ + +# + +clean: + dh_testdir + dh_testroot + + quilt pop -a -R || test $$? = 2 + + # remove quilt cruft + rm -f patches + rm -rf .pc + + rm -f configure-stamp build-stamp install-stamp + rm -f config.guess config.sub + + # Remove build tree + rm -rf $(objdir) + + dh_clean + +# + +install: install-stamp +install-stamp: + dh_testdir + dh_testroot + dh_clean + dh_installdirs + cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + dh_install --list-missing + touch $@ + +# + +binary: binary-arch + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installmime + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -V + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-indep: + @echo "Nothing to do." + +# + +.PHONY: configure build clean install binary binary-arch binary-indep --- vorbis-tools-1.1.1.orig/debian/vorbis-tools.mime +++ vorbis-tools-1.1.1/debian/vorbis-tools.mime @@ -0,0 +1 @@ +application/ogg; ogg123 %s; description="Ogg Vorbis multimedia format"; priority=5 --- vorbis-tools-1.1.1.orig/debian/compat +++ vorbis-tools-1.1.1/debian/compat @@ -0,0 +1 @@ +5 --- vorbis-tools-1.1.1.orig/debian/control +++ vorbis-tools-1.1.1/debian/control @@ -0,0 +1,18 @@ +Source: vorbis-tools +Section: sound +Priority: optional +Maintainer: Debian Xiph.org Maintainers +Uploaders: Adeodato SimĂł , Clint Adams +Build-Depends: autotools-dev, debhelper, quilt, libcurl4-gnutls-dev, libao-dev, libogg-dev, libflac-dev (>= 1.1.4-1) | liboggflac-dev, libspeex-dev, libvorbis-dev +Standards-Version: 3.7.2 +XS-VCS-Bzr: http://bzr.debian.org/bzr/pkg-xiph/vorbis-tools + +Package: vorbis-tools +Architecture: any +Depends: ${shlibs:Depends} +Description: several Ogg Vorbis tools + vorbis-tools contains oggenc (an encoder), ogg123 (a playback tool), + ogginfo (displays ogg information), oggdec (decodes ogg files), vcut + (ogg file splitter), and vorbiscomment (ogg comment editor). + . + ogg123 can play both Ogg Vorbis and FLAC audio streams. --- vorbis-tools-1.1.1.orig/debian/copyright +++ vorbis-tools-1.1.1/debian/copyright @@ -0,0 +1,24 @@ +This package was debianized by Christopher L Cheney on +Tue, 31 Oct 2000 16:38:42 -0600. + +Adeodato SimĂł stepped as a co-maintainer on +Sat, 19 Nov 2005 12:04:38 +0100. + +It was downloaded from http://www.xiph.org/downloads/: + + URL: + +Upstream Authors: Kenneth Arnold + Segher Boessenkool + Stan Seibert + Michael Smith + +Copyright: + +THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2000 by Monty + and The XIPHOPHORUS Company http://www.xiph.org/ + +You are free to distribute this software under the terms of the +GNU General Public License. On Debian systems, the complete text +of the GNU General Public License can be found in +/usr/share/common-licenses/GPL file. --- vorbis-tools-1.1.1.orig/debian/changelog +++ vorbis-tools-1.1.1/debian/changelog @@ -0,0 +1,306 @@ +vorbis-tools (1.1.1-15) unstable; urgency=low + + * Update vorbistagedit to 0.5 to cope with bash users. + closes: #421319. + + -- Clint Adams Mon, 22 Oct 2007 11:27:35 -0400 + +vorbis-tools (1.1.1-14) unstable; urgency=low + + * Update long description to mention that ogg123 can play FLAC + files. closes: #434827. + + -- Clint Adams Fri, 27 Jul 2007 00:58:03 -0400 + +vorbis-tools (1.1.1-13) unstable; urgency=low + + * Update for the FLAC 1.1.4 transition: + + grab patch from upstream to cope with libOggFLAC having been merged into + libFLAC. + + build-depend on libflac-dev (>= 1.1.4-1), keeping liboggflac-dev as a + second alternative. + (Closes: #426674) + + * Remove irrelevant blurb about "written for Debian because the original + program does not have a manual page" from vorbistagedit.1. + + * Add XS-VCS-Bzr header in debian/control. + + -- Adeodato SimĂł Wed, 06 Jun 2007 19:01:31 +0200 + +vorbis-tools (1.1.1-12) unstable; urgency=high + + * Switch build dependency from "libcurl3-gnutls-dev" to + "libcurl4-gnutls-dev". closes: #423654. + * Add upstream_r12202-ogg123_curlopt_mute.diff to handle + CURLOPT_MUTE being dropped in curl4. + + -- Clint Adams Sun, 13 May 2007 19:12:26 -0400 + +vorbis-tools (1.1.1-11) unstable; urgency=low + + * Add upstream_r12201-ogg123_crlf_in_playlists.diff to handle + CR/LF endings in playlists. closes: #173676. + + -- Clint Adams Sat, 20 Jan 2007 10:44:53 -0500 + +vorbis-tools (1.1.1-10) unstable; urgency=low + + * Add upstream_r12189-ogg123_2hr_intermittentnoise.diff to fix + "ogg123 output corrupted after some time of playback". + closes: #298719. + + -- Clint Adams Thu, 18 Jan 2007 15:23:29 -0500 + +vorbis-tools (1.1.1-9) unstable; urgency=low + + * Update vorbistagedit to upstream version 0.4. + + -- Clint Adams Thu, 18 Jan 2007 12:29:42 -0500 + +vorbis-tools (1.1.1-8) unstable; urgency=low + + * Update vorbistagedit to upstream version 0.3, fixing bashisms. + closes: #381705. + * Add man page for vorbistagedit from François Wendling. + closes: #399116. + + -- Clint Adams Thu, 18 Jan 2007 12:08:59 -0500 + +vorbis-tools (1.1.1-7) unstable; urgency=medium + + * Add for_upstream-ogg123_flac_divbyzero.diff to fix SIGFPE when + playing certain corrupt .flac files. Submitted upstream as + xiph.org Trac ticket #1119. closes: #407022. + * Bump Standards-Version to 3.7.2. + + -- Clint Adams Wed, 17 Jan 2007 11:24:37 -0500 + +vorbis-tools (1.1.1-6) unstable; urgency=low + + * Include vorbistagedit script from martin f. krafft to edit vorbis tags in + an editor. (Closes: #357421) + + * Build with LFS, without touching configure.ac this time, as adviced by the + submitter. Submit however debian/patches/for_upstream-largefile_support.diff + to upstream, together with dean gaudet's include_config_h_everywhere.patch. + (Closes: #364527) + + * Fix typos in manpages spotted by A Costa. (Closes: #353184, #353185) + + -- Adeodato SimĂł Thu, 13 Jul 2006 21:25:09 +0200 + +vorbis-tools (1.1.1-5) unstable; urgency=low + + * Fix additional oggenc man page typos with patch from A Costa. + closes: #353186. + * Fix ogg123 returning 0 on corrupted file. closes: #193349. + [File: upstream_r10091-ogg123_return_error.diff] + + -- Clint Adams Sun, 26 Mar 2006 20:11:50 -0500 + +vorbis-tools (1.1.1-4) unstable; urgency=low + + * Build with LFS. closes: #359068. + + -- Clint Adams Sun, 26 Mar 2006 19:43:40 -0500 + +vorbis-tools (1.1.1-3) unstable; urgency=low + + * Switch patch management to quilt. + + -- Adeodato SimĂł Mon, 16 Jan 2006 22:49:20 +0100 + +vorbis-tools (1.1.1-2) unstable; urgency=medium + + * Switch maintenance to the Debian Xiph.org Maintainers (alioth/pkg-xiph). + + * Fix display of non-ASCII characters in comments, broken in 1.1.1 release. + (Closes: #344195, #344917) + [File: upstream_r10080_fix_non-ascii_comments.diff] + + * Patch configure not to use -ffast-math, which is reportedly broken on + alpha. While we're at it, do not use -O20 (!) either. + [File: no_fast-math.diff] + + * Add debian/watch file. + + -- Adeodato SimĂł Tue, 27 Dec 2005 23:08:25 +0100 + +vorbis-tools (1.1.1-1) unstable; urgency=low + + * New upstream release packaged (closes: #339846). + + * Pull patch from upstream to prevent vorbiscomment from clobbering files + when an error happens. (Closes: #287170) + [File: upstream_r9935-dont_clobber_file_on_error.diff] + + * Add myself as an uploader, as agreed with Christopher in the past; + note it in debian/copyright. + + * Update debian/control: + + + drop unnecessary build-dependencies on bison and devscripts. + + build-depend on libcurl3-gnutls-dev instead of libcurl3-dev | libcurl-dev + (vorbis-tools is GPL'ed, no SSL exception). + + drop version restriction on all build-dependencies, since they'd be all + satisfied with stable. + + * Overhaul debian/rules. + + * Make use of debian/patches, putting in separate files the patches applied + in previous NMUs (deactivated some of them because they no longer apply + and/or are incomplete, until I figure out what to do with them; reopens: + #272037, #264365). + + * Update download URL in debian/copyright. + + * Bumped Standards-Version to 3.6.2 (no changes required). + + -- Adeodato SimĂł Wed, 07 Dec 2005 06:21:02 +0100 + +vorbis-tools (1.0.1-1.5) unstable; urgency=low + + * Non-maintainer upload during BSP. + + * Make package installable again by rebuilding against new FLAC libraries. + (Closes: #325955) + + * As requested by upstream, include patch to fix playing from a pipe. + (Closes: #237187) + + [Patch in debian/patches/play-from-pipe.diff, but present in the .diff.gz + because debian/rules does not apply debian/patches/*.] + + -- Adeodato SimĂł Sun, 04 Sep 2005 05:41:42 +0200 + +vorbis-tools (1.0.1-1.4) unstable; urgency=low + + * Authorized NMU. + + * Restore speex support (closes: #306809). This had been lost in the + previous upload due to speex 1.1 having moved its include files from + /usr/include to /usr/include/speex. + + + debian/rules: add -I/usr/include/speex to CFLAGS (and export it too). + + -- Adeodato SimĂł Sat, 04 Jun 2005 02:13:03 +0200 + +vorbis-tools (1.0.1-1.3) unstable; urgency=low + + * Authorized NMU. + * Modified alsa to mention alsa09 (although the device might be nowadays + alsa, back, since alsa1.0 has been already released). (Closes: #258286) + * Modified the manpage/help message for vorbiscomment to make it a bit more + userfiendly: Closes: #252531. + * Added oggdec to the long description field, so that it triggers apt-cache + searches: Closes: #274894. + * Typos in manpages: Closes: #302150. + * Escaped dashes in manpage: Closes: #264365. + * Quiet option is actually with -Q, not -q (Closes: #211289) Reported + upstream but patched for Debian. + * Change input.wav with inputfile, since we accept flac-formated files: + Closes: #262509. + * Translation bits: + * Updated translation hu.po: Closes: #272037. + * French translation correction: Encodage -> Codage (Closes: #248431). + * debian/rules: remove .gmo's to avoid clash with uploaded tarball. + + -- Jesus Climent Sun, 10 Apr 2005 09:22:24 +0000 + +vorbis-tools (1.0.1-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * [debian/control] Versioned build dependency on liboggflac-dev so as to + guarantee the binary packages no longer depend on libflac4 and are thus + installable again in sid. (Closes: #289291, #289313) + + -- J.H.M. Dassen (Ray) Sun, 9 Jan 2005 12:20:44 +0100 + +vorbis-tools (1.0.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Switched to libcurl3-dev (closes: #260207). + + -- Domenico Andreoli Wed, 22 Dec 2004 18:57:26 +0100 + +vorbis-tools (1.0.1-1) unstable; urgency=low + + * New upstream. + * Include ogg123rc-example. (Closes: #187204) + * Add application/ogg to vorbis-tools.mime. (Closes: #204883) + + -- Christopher L Cheney Wed, 10 Dec 2003 22:00:00 -0600 + +vorbis-tools (1.0.0-2) unstable; urgency=low + + * Rebuild against new libvorbis0a package. + * GNU config automated update: config.sub (20020621 to 20030103), + config.guess (20020529 to 20030110) + + -- Christopher L Cheney Sat, 8 Mar 2003 13:30:00 -0600 + +vorbis-tools (1.0.0-1) unstable; urgency=low + + * New upstream. + (Closes: #88450, #109241, #111565, #127184, #127688, #127730, #127734, + #127999, #130021, #136663, #136664, #140909, #146271, #146314) + + -- Christopher L Cheney Fri, 19 Jul 2002 09:00:00 -0500 + +vorbis-tools (1.0rc3-1) unstable; urgency=low + + * New upstream. (Closes: #90852, #103707, #104366, #107898, #108803, + #113855, #114730, #115859, #117091) + * added autotools target (config.* updater) to rules + + -- Christopher L Cheney Mon, 24 Dec 2001 11:00:00 -0600 + +vorbis-tools (1.0rc2-1) unstable; urgency=low + + * New upstream. (Closes: #98059, #99050) + * Build with empty diff.gz to fix bug. (Closes: #104473) + + -- Christopher L Cheney Mon, 13 Aug 2001 00:00:00 -0500 + +vorbis-tools (1.0rc1-1) unstable; urgency=low + + * New upstream. (Closes: #87697, #87907, #98937) + * Fixed versioned depends. (Closes: #88561, #89772) + * Changed clean method to distclean. (Closes: #96775) + * Updated description. (Closes: #88573) + * debian dir is maintained in upstream cvs. (Closes: #96773) + * Updated manpage for upstream. (Closes: #90873, #92229) + * Applied patch for randomize ogg123 for upstream (Closes: #84336, #98945) + * # appears to just work in ogg123rc so it must be fixed (Closes: #87398) + + -- Christopher L Cheney Sun, 17 Jun 2001 20:00:00 -0500 + +vorbis-tools (1.0beta4-1) unstable; urgency=low + + * New upstream. + * Fix for multi open /dev/dsp (closes: #81146) + * devfs bug fixed (closes: #81621) + + -- Christopher L Cheney Mon, 26 Feb 2001 08:00:00 -0600 + +vorbis-tools (1.0beta3-3) unstable; urgency=low + + * Fixed Build-Depends version dependencies. + * Updated to Standards-Version to 3.5.1.0 + + -- Christopher L Cheney Sat, 17 Feb 2001 18:18:38 -0600 + +vorbis-tools (1.0beta3-2) unstable; urgency=low + + * Use abcde (closes: #70032) + * Fixed (closes: #72381) + * Corrected README.Debian (closes: #78803) + + -- Christopher L Cheney Sat, 3 Feb 2001 13:38:34 -0600 + +vorbis-tools (1.0beta3-1) unstable; urgency=low + + * Initial Release. + + -- Christopher L Cheney Tue, 31 Oct 2000 16:38:42 -0600 --- vorbis-tools-1.1.1.orig/debian/watch +++ vorbis-tools-1.1.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://downloads.xiph.org/releases/vorbis/vorbis-tools-(.+)\.tar\.gz --- vorbis-tools-1.1.1.orig/debian/vorbis-tools.manpages +++ vorbis-tools-1.1.1/debian/vorbis-tools.manpages @@ -0,0 +1,8 @@ +debian/tmp/usr/man/man1/ogg123.1 +debian/tmp/usr/man/man1/oggdec.1 +debian/tmp/usr/man/man1/oggenc.1 +debian/tmp/usr/man/man1/ogginfo.1 +debian/tmp/usr/man/man1/vcut.1 +debian/tmp/usr/man/man1/vorbiscomment.1 + +debian/extra/vorbistagedit.1