final fixes for UIQ3

[picodrive.git] / Pico / cd / cd_sys.c

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index 581583b..03bf0d2 100644 (file)
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -196,16 +196,16 @@ PICO_INTERNAL void Reset_CD(void)
 }\r
 \r
 \r
-int Insert_CD(char *iso_name, int is_bin)\r
+int Insert_CD(char *cdimg_name, int type)\r
 {\r
-       int ret = 0;\r
+       int ret = 1;\r
 \r
        CD_Present = 0;\r
        Pico_mcd->scd.Status_CDD = NOCD;\r
 \r
-       if (iso_name != NULL)\r
+       if (cdimg_name != NULL && type != CIT_NOT_CD)\r
        {\r
-               ret = Load_ISO(iso_name, is_bin);\r
+               ret = Load_CD_Image(cdimg_name, type);\r
                if (ret == 0) {\r
                        CD_Present = 1;\r
                        Pico_mcd->scd.Status_CDD = READY;\r
@@ -489,8 +489,7 @@ PICO_INTERNAL int Play_CDD_c3(void)
        else\r
        {\r
                Pico_mcd->s68k_regs[0x36] &= ~0x01;                             // AUDIO\r
-               //CD_Audio_Starting = 1;\r
-               FILE_Play_CD_LBA();\r
+               cdda_start_play();\r
        }\r
 \r
        if (Pico_mcd->scd.Cur_Track == 100) Pico_mcd->cdd.Minute = 0x0A02;\r
@@ -592,8 +591,7 @@ PICO_INTERNAL int Resume_CDD_c7(void)
        else\r
        {\r
                Pico_mcd->s68k_regs[0x36] &= ~0x01;                             // AUDIO\r
-               //CD_Audio_Starting = 1;\r
-               FILE_Play_CD_LBA();\r
+               cdda_start_play();\r
        }\r
 \r
        if (Pico_mcd->scd.Cur_Track == 100) Pico_mcd->cdd.Minute = 0x0A02;\r