diff options
author | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-07-28 23:46:49 +0000 |
---|---|---|
committer | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-07-28 23:46:49 +0000 |
commit | 634e76de2ca43635fc6ba62d1d66e8eda5f3bb0c (patch) | |
tree | 17610a266676fd7c1d0dfee5d61897a3789219b9 /audio/moc/files | |
parent | - Re-enable CJK patches (diff) |
Add moc.
MOC (music on console) is a console audio player designed to be powerful and
easy to use.
MOC plays smoothly, regardless of system or I/O load, because it handles the
output buffer in a separate thread. It does not cause gaps between files,
because the next file to be played is pre-cached while playing the current
file.
Supported file formats are: MP3, Ogg Vorbis, FLAC, Musepack (mpc), Speex, WAVE,
AIFF, AU, SVX, Sphere Nist WAV, IRCAM SF, Creative VOC.
WWW: http://moc.daper.net/
PR: ports/84153
Submitted by: Integral <rzinkov@gmail.com>
Notes
Notes:
svn path=/head/; revision=140354
Diffstat (limited to 'audio/moc/files')
-rw-r--r-- | audio/moc/files/patch-audio__conversion.c | 45 | ||||
-rw-r--r-- | audio/moc/files/patch-decoder__plugins_flac_flac.c | 16 | ||||
-rw-r--r-- | audio/moc/files/patch-decoder__plugins_speex_speex.c | 11 | ||||
-rw-r--r-- | audio/moc/files/patch-io__curl.c | 11 | ||||
-rw-r--r-- | audio/moc/files/patch-server.c | 12 |
5 files changed, 95 insertions, 0 deletions
diff --git a/audio/moc/files/patch-audio__conversion.c b/audio/moc/files/patch-audio__conversion.c new file mode 100644 index 000000000000..8d4484c56182 --- /dev/null +++ b/audio/moc/files/patch-audio__conversion.c @@ -0,0 +1,45 @@ +--- audio_conversion.c.orig Wed Jun 15 18:56:46 2005 ++++ audio_conversion.c Fri Jul 29 01:19:15 2005 +@@ -27,7 +27,8 @@ + #define __USE_ISOC99 1 + + #include <assert.h> +-#include <stdint.h> ++#include <inttypes.h> ++#include <limits.h> + #include <stdlib.h> + #include <math.h> + #include <string.h> +@@ -43,6 +44,32 @@ + #include "main.h" + #include "log.h" + #include "options.h" ++ ++/* FreeBSD 4.x lacks these */ ++ ++#ifndef INT8_MIN ++#define INT8_MIN CHAR_MIN ++#endif ++ ++#ifndef INT8_MAX ++#define INT8_MAX CHAR_MAX ++#endif ++ ++#ifndef INT16_MIN ++#define INT16_MIN SHRT_MIN ++#endif ++ ++#ifndef INT16_MAX ++#define INT16_MAX SHRT_MAX ++#endif ++ ++#ifndef INT32_MIN ++#define INT32_MIN INT_MIN ++#endif ++ ++#ifndef INT32_MAX ++#define INT32_MAX INT_MAX ++#endif + + /* Byte order conversion */ + /* TODO: use functions from byteswap.h if available */ diff --git a/audio/moc/files/patch-decoder__plugins_flac_flac.c b/audio/moc/files/patch-decoder__plugins_flac_flac.c new file mode 100644 index 000000000000..7fa26bf521ab --- /dev/null +++ b/audio/moc/files/patch-decoder__plugins_flac_flac.c @@ -0,0 +1,16 @@ +--- decoder_plugins/flac/flac.c.orig Fri Jul 29 01:31:54 2005 ++++ decoder_plugins/flac/flac.c Fri Jul 29 01:32:11 2005 +@@ -422,11 +422,12 @@ + static int flac_seek (void *void_data, int sec) + { + struct flac_data *data = (struct flac_data *)void_data; ++ FLAC__uint64 target_sample; + + if (sec < 0 || (unsigned)sec > data->length) + return -1; + +- FLAC__uint64 target_sample = (FLAC__uint64)((sec/(double)data->length) ++ target_sample = (FLAC__uint64)((sec/(double)data->length) + * (double)data->total_samples); + + if (FLAC__seekable_stream_decoder_seek_absolute(data->decoder, diff --git a/audio/moc/files/patch-decoder__plugins_speex_speex.c b/audio/moc/files/patch-decoder__plugins_speex_speex.c new file mode 100644 index 000000000000..8420e7caa0b4 --- /dev/null +++ b/audio/moc/files/patch-decoder__plugins_speex_speex.c @@ -0,0 +1,11 @@ +--- decoder_plugins/speex/speex.c.orig Fri Jul 29 01:34:35 2005 ++++ decoder_plugins/speex/speex.c Fri Jul 29 01:34:45 2005 +@@ -17,7 +17,7 @@ + #endif + + #include <string.h> +-#include <stdint.h> ++#include <inttypes.h> + #include <assert.h> + #include <speex/speex.h> + #include <speex/speex_header.h> diff --git a/audio/moc/files/patch-io__curl.c b/audio/moc/files/patch-io__curl.c new file mode 100644 index 000000000000..0a34e79613c7 --- /dev/null +++ b/audio/moc/files/patch-io__curl.c @@ -0,0 +1,11 @@ +--- io_curl.c.orig Fri Jul 29 01:21:58 2005 ++++ io_curl.c Fri Jul 29 01:22:25 2005 +@@ -24,7 +24,7 @@ + #include <unistd.h> + #include <errno.h> + #include <assert.h> +-#include <stdint.h> ++#include <inttypes.h> + + #define DEBUG + diff --git a/audio/moc/files/patch-server.c b/audio/moc/files/patch-server.c new file mode 100644 index 000000000000..c97f8ee942f7 --- /dev/null +++ b/audio/moc/files/patch-server.c @@ -0,0 +1,12 @@ +--- server.c.orig Fri Jul 29 01:02:48 2005 ++++ server.c Fri Jul 29 01:02:54 2005 +@@ -212,8 +212,8 @@ + + static void del_client (struct client *cli) + { +- cli->socket = -1; + struct event *e; ++ cli->socket = -1; + + /* Free the event queue - we can't just use event_queue_free(), because + * it can't free() the event's data. */ |