[vlc-commits] VCD: clean cdrom.h header

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jan  2 13:07:07 2015 +0100| [034e01d6617cc7a73dcc0b54f388fb8fa8ea685b] | committer: Jean-Baptiste Kempf

VCD: clean cdrom.h header

Use the actual definitions from the ColourBooks
Use enums instead of macros

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=034e01d6617cc7a73dcc0b54f388fb8fa8ea685b
---

 modules/access/vcd/cdrom.h |   37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/modules/access/vcd/cdrom.h b/modules/access/vcd/cdrom.h
index 0704e57..0e9e342 100644
--- a/modules/access/vcd/cdrom.h
+++ b/modules/access/vcd/cdrom.h
@@ -25,26 +25,37 @@
 #ifndef VLC_CDROM_H
 #define VLC_CDROM_H
 
-#define CDDA_TYPE 0
-#define VCD_TYPE 1
+enum {
+    CDDA_TYPE = 0,
+    VCD_TYPE  = 1,
+};
+
+/* size of a CD sector */
+#define CD_RAW_SECTOR_SIZE  2352
+#define CD_ROM_MODE1_DATA_SIZE 2048
+#define CD_ROM_MODE2_DATA_SIZE 2336
+
+#define CD_ROM_XA_MODE2_F1_DATA_SIZE 2048
+#define CD_ROM_XA_MODE2_F2_DATA_SIZE 2324
+
+/* size of a CD sector */
+#define CD_SECTOR_SIZE      CD_ROM_MODE1_DATA_SIZE
 
 /* where the data start on a VCD sector */
-#define VCD_DATA_START 24
-/* size of the availablr data on a VCD sector */
-#define VCD_DATA_SIZE 2324
+#define VCD_DATA_START      24
+/* size of the available data on a VCD sector */
+#define VCD_DATA_SIZE       CD_ROM_XA_MODE2_F2_DATA_SIZE
 /* size of a VCD sector, header and tail included */
-#define VCD_SECTOR_SIZE 2352
-/* size of a CD sector */
-#define CD_SECTOR_SIZE 2048
+#define VCD_SECTOR_SIZE     CD_RAW_SECTOR_SIZE
 /* sector containing the entry points */
-#define VCD_ENTRIES_SECTOR 151
+#define VCD_ENTRIES_SECTOR  151
 
 /* where the data start on a CDDA sector */
-#define CDDA_DATA_START 0
-/* size of the availablr data on a CDDA sector */
-#define CDDA_DATA_SIZE 2352
+#define CDDA_DATA_START     0
+/* size of the available data on a CDDA sector */
+#define CDDA_DATA_SIZE      CD_RAW_SECTOR_SIZE
 /* size of a CDDA sector, header and tail included */
-#define CDDA_SECTOR_SIZE 2352
+#define CDDA_SECTOR_SIZE    CD_RAW_SECTOR_SIZE
 
 /*****************************************************************************
  * Misc. Macros