#include "mem.h"
#include <string.h>
#include <fcntl.h>
+#include <sys/stat.h>
+#include <errno.h>
static int hreader_fill(struct hreader *h, off_t offset);
-void hreader_init(const char *path, struct hreader *h) {
+int hreader_init(const char *path, struct hreader *h) {
+ struct stat sb;
+ if(stat(path, &sb) < 0)
+ return -1;
memset(h, 0, sizeof *h);
h->path = xstrdup(path);
+ h->size = sb.st_size;
h->bufsize = 65536;
h->buffer = xmalloc_noptr(h->bufsize);
+ return 0;
}
int hreader_read(struct hreader *h, void *buffer, size_t n) {
return n;
}
+off_t hreader_seek(struct hreader *h, off_t offset, int whence) {
+ switch(whence) {
+ case SEEK_SET: break;
+ case SEEK_CUR: offset += h->read_offset; break;
+ case SEEK_END: offset += h->size; break;
+ default: einval: errno = EINVAL; return -1;
+ }
+ if(offset < 0) goto einval;
+ h->read_offset = offset;
+ return offset;
+}
+
/*
Local Variables:
c-basic-offset:2
*/
struct hreader {
const char *path; /* file to read */
+ off_t size; /* file size */
off_t read_offset; /* for next hreader_read() */
off_t buf_offset; /* offset of start of buffer */
char *buffer; /* input buffer */
/** @brief Initialize a hands-off reader
* @param path File to read
* @param h Reader to initialize
+ * @return 0 on success, -1 on error
*/
-void hreader_init(const char *path, struct hreader *h);
+int hreader_init(const char *path, struct hreader *h);
/** @brief Read some bytes
* @param h Reader to read from
*/
int hreader_pread(struct hreader *h, void *buffer, size_t n, off_t offset);
+/** @brief Seek within a file
+ * @param h Reader to seek
+ * @param offset Offset
+ * @param whence SEEK_*
+ * @return Result offset
+ */
+off_t hreader_seek(struct hreader *h, off_t offset, int whence);
+
#endif /* HREADER_H */
/*
static void decode_mp3(void) {
struct mad_decoder mad[1];
- hreader_init(path, input);
+ if(hreader_init(path, input))
+ disorder_fatal(errno, "opening %s", path);
mad_decoder_init(mad, 0/*data*/, mp3_input, 0/*header*/, 0/*filter*/,
mp3_output, mp3_error, 0/*message*/);
if(mad_decoder_run(mad, MAD_DECODER_MODE_SYNC))
mad_decoder_finish(mad);
}
+static size_t ogg_read_func(void *ptr, size_t size, size_t nmemb, void *datasource) {
+ struct hreader *h = datasource;
+
+ int n = hreader_read(h, ptr, size * nmemb);
+ if(n < 0) n = 0;
+ return n / size;
+}
+
+static int ogg_seek_func(void *datasource, ogg_int64_t offset, int whence) {
+ struct hreader *h = datasource;
+
+ return hreader_seek(h, offset, whence) < 0 ? -1 : 0;
+}
+
+static int ogg_close_func(void attribute((unused)) *datasource) {
+ return 0;
+}
+
+static long ogg_tell_func(void *datasource) {
+ struct hreader *h = datasource;
+
+ return hreader_seek(h, 0, SEEK_CUR);
+}
+
+static const ov_callbacks ogg_callbacks = {
+ ogg_read_func,
+ ogg_seek_func,
+ ogg_close_func,
+ ogg_tell_func,
+};
+
/** @brief OGG decoder */
static void decode_ogg(void) {
- FILE *fp;
+ struct hreader ogginput[1];
OggVorbis_File vf[1];
int err;
long n;
int bitstream;
vorbis_info *vi;
- if(!(fp = fopen(path, "rb")))
- disorder_fatal(errno, "cannot open %s", path);
+ hreader_init(path, ogginput);
/* There doesn't seem to be any standard function for mapping the error codes
* to strings l-( */
- if((err = ov_open(fp, vf, 0/*initial*/, 0/*ibytes*/)))
- disorder_fatal(0, "ov_fopen %s: %d", path, err);
+ if((err = ov_open_callbacks(ogginput, vf, 0/*initial*/, 0/*ibytes*/,
+ ogg_callbacks)))
+ disorder_fatal(0, "ov_open_callbacks %s: %d", path, err);
if(!(vi = ov_info(vf, 0/*link*/)))
disorder_fatal(0, "ov_info %s: failed", path);
while((n = ov_read(vf, input_buffer, sizeof input_buffer, 1/*bigendianp*/,