#define CHUNKSIZE 4096
-static int vcedit_open (vcedit_state *state);
-
struct vcedit_state_St {
int refcount;
char filename[PATH_MAX];
FILE *in;
+ bool opened;
long serial;
unsigned char *mainbuf;
unsigned char *bookbuf;
int mainlen;
int booklen;
- const char *lasterror;
char *vendor;
int prevW;
int extrapage;
snprintf (state->filename, sizeof (state->filename),
"%s", filename);
- state->in = fopen (state->filename, "rb");
-
- if (vcedit_open (state) < 0) {
- vcedit_state_free (state);
- return NULL;
- }
-
return state;
}
-const char *
-vcedit_error (vcedit_state *state)
-{
- return state->lasterror;
-}
-
vorbis_comment *
vcedit_comments (vcedit_state *state)
{
- return state->vc;
+ return state->opened ? state->vc : NULL;
}
static void
state->booklen = 0;
state->serial = 0;
+ state->opened = false;
}
void
return _fetch_next_packet (s, p, page);
}
-static int
+vcedit_error
vcedit_open (vcedit_state *state)
{
+ vcedit_error ret;
char *buffer;
int bytes, i;
int chunks = 0;
ogg_packet header_main, header_comments, header_codebooks;
ogg_page og;
+ state->in = fopen (state->filename, "rb");
+ if (!state->in)
+ return VCEDIT_ERR_OPEN;
+
ogg_sync_init (state->oy);
while (1) {
/* Bail if we don't find data in the first 40 kB */
if (chunks++ >= 10) {
- if (bytes < CHUNKSIZE)
- state->lasterror = "Input truncated or empty.";
- else
- state->lasterror = "Input is not an Ogg bitstream.";
+ ret = VCEDIT_ERR_INVAL;
goto err;
}
vorbis_comment_init (state->vc);
if (ogg_stream_pagein (state->os, &og) < 0) {
- state->lasterror = "Error reading first page of Ogg bitstream.";
+ ret = VCEDIT_ERR_INVAL;
goto err;
}
if (ogg_stream_packetout (state->os, &header_main) != 1) {
- state->lasterror = "Error reading initial header packet.";
+ ret = VCEDIT_ERR_INVAL;
goto err;
}
if (vorbis_synthesis_headerin (state->vi, state->vc, &header_main) < 0) {
- state->lasterror = "Ogg bitstream does not contain vorbis data.";
+ ret = VCEDIT_ERR_INVAL;
goto err;
}
break;
if (result == -1) {
- state->lasterror = "Corrupt secondary header.";
+ ret = VCEDIT_ERR_INVAL;
goto err;
}
bytes = fread (buffer, 1, CHUNKSIZE, state->in);
if (bytes == 0 && i < 2) {
- state->lasterror = "EOF before end of vorbis headers.";
+ ret = VCEDIT_ERR_INVAL;
goto err;
}
state->vendor = strdup (state->vc->vendor);
/* Headers are done! */
- return 0;
+ state->opened = true;
+
+ return VCEDIT_ERR_SUCCESS;
err:
vcedit_clear_internals (state);
- return -1;
+ return ret;
}
-int
+vcedit_error
vcedit_write (vcedit_state *state)
{
ogg_stream_state streamout;
int s, result, bytes, needflush = 0, needout = 0;
size_t tmp;
+ if (!state->opened)
+ return VCEDIT_ERR_INVAL;
+
strcpy (tmpfile, state->filename);
strcat (tmpfile, ".XXXXXX");
s = mkstemp (tmpfile);
- if (s == -1) {
- state->lasterror = "Error writing stream to output. "
- "Cannot open temporary file.";
- return -1;
- }
+ if (s == -1)
+ return VCEDIT_ERR_TMPFILE;
out = fdopen (s, "wb");
if (!out) {
unlink (tmpfile);
close (s);
- state->lasterror = "Error writing stream to output. "
- "Cannot open temporary file.";
- return -1;
+
+ return VCEDIT_ERR_TMPFILE;
}
state->prevW = state->extrapage = state->eosin = 0;
if (!result)
break;
- if (result < 0)
- state->lasterror = "Corrupt or missing data, continuing...";
- else {
+ if (result >= 0) {
/* Don't bother going through the rest, we can just
* write the page out now
*/
state->mainbuf = state->bookbuf = NULL;
- if (!state->eosin) {
- state->lasterror = "Error writing stream to output. "
- "Output stream may be corrupted or truncated.";
- return -1;
- }
+ if (!state->eosin)
+ return VCEDIT_ERR_INVAL;
vcedit_clear_internals (state);
- state->in = fopen (state->filename, "rb");
- vcedit_open (state);
-
- return 0;
+ return (vcedit_open (state) == VCEDIT_ERR_SUCCESS) ?
+ VCEDIT_ERR_SUCCESS : VCEDIT_ERR_REOPEN;
}