claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Messed up on SVCD test.

Browse Source
This commit is contained in:
rocky
2003-08-13 12:33:59 +00:00
parent bbd86ea2bb
commit 99780af8cc
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-info.c,v 1.16 2003/08/13 12:18:49 rocky Exp $ $Id: cd-info.c,v 1.17 2003/08/13 12:33:59 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org>
@@ -136,7 +136,7 @@ and
#define VIDEOCDI 1024 #define VIDEOCDI 1024
#define ROCKRIDGE 2048 #define ROCKRIDGE 2048
#define JOLIET 4096 #define JOLIET 4096
#define CVD 8192 /* Choiji Video CD */ #define SVCD 8192 /* Choiji Video CD */
char buffer[6][CDIO_CD_FRAMESIZE_RAW]; /* for CD-Data */ char buffer[6][CDIO_CD_FRAMESIZE_RAW]; /* for CD-Data */
@@ -195,7 +195,7 @@ static signature_t sigs[] =
#define IS_UFS 9 #define IS_UFS 9
#define IS_BOOTABLE 10 #define IS_BOOTABLE 10
#define IS_VIDEO_CD 11 /* Video CD */ #define IS_VIDEO_CD 11 /* Video CD */
#define IS_CVD 12 /* Chinese Video CD - slightly incompatible with SVCD */ #define IS_SVCD 12 /* SVCD or CVD */
int rc; /* return code */ int rc; /* return code */
int i,j; /* index */ int i,j; /* index */
@@ -650,23 +650,9 @@ guess_filesystem(int start_session, track_t track_num)
return ret; return ret;
if (is_it(IS_BRIDGE) && is_it(IS_CD_RTOS)) { if (is_it(IS_BRIDGE) && is_it(IS_CD_RTOS)) {
if (opts.debug_level > 0) { if (is_it(IS_VIDEO_CD)) ret |= VIDEOCDI;
/* buffer[4] is defined */ else if (is_it(IS_SVCD)) ret |= SVCD;
is_it_dbg(IS_VIDEO_CD);
puts("");
}
if (is_it(IS_VIDEO_CD)) ret |= VIDEOCDI;
} else {
if (opts.debug_level > 0) {
/* buffer[4] is defined */
is_it_dbg(IS_CVD);
puts("");
}
if (is_it(IS_CVD)) ret |= CVD;
} }
} }
} }
else if (is_hfs()) ret |= FS_HFS; else if (is_hfs()) ret |= FS_HFS;
@@ -989,9 +975,9 @@ print_analysis(int fs, int num_audio)
} }
#endif #endif
} }
if (fs & CVD) if (fs & SVCD)
need_lf += printf("Chaoji Video CD"); need_lf += printf("Super Video CD (SVCD) or Chaoji Video CD (CVD)");
if (need_lf) puts(""); if (need_lf) printf("\n");
} }