Show
Ignore:
Timestamp:
2008-11-20 19:37:03 (2 months ago)
Author:
conrad
Message:

oggz-rip: use oggz_stream_get_content_type instead of local ot_identify(),
fix oggz_read() error check

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • liboggz/trunk/src/tools/oggz-rip.c

    r3674 r3806  
    182182  stream->content_type = "unknown"; 
    183183 
    184   ident = ot_page_identify (oggz, og, NULL); 
    185   if (ident != NULL) stream->content_type = ident; 
     184  stream->content_type = oggz_stream_get_content_type (oggz, serialno); 
    186185    
    187186  if (ordata->verbose) 
    …… 
    258257  oggz_set_read_page (ordata->reader, -1, read_page, ordata); 
    259258   
    260   while ((n = oggz_read (ordata->reader, READ_SIZE))) { 
    261  
    262     if (n <= 0) 
    263       return n; 
    264  
     259  while ((n = oggz_read (ordata->reader, READ_SIZE)) != 0) { 
    265260    if (ordata->verbose) { 
    266261      fprintf (stderr, "\r Read %li k, wrote %li k ...\r",