Rename cdrom_device profile to playlist

Also renames `-devcd` command line flag to `-playlist`.

The old names can still be used for backwards compatibility.
This commit is contained in:
kichikuou
2024-01-28 10:28:15 +09:00
parent 48a41b9f82
commit ea5cef91fd
10 changed files with 25 additions and 19 deletions
+1 -1
View File
@@ -28,7 +28,7 @@
static int current_track;
static int cdrom_bgm_init(char *dev) {
static int cdrom_bgm_init(char *playlist) {
prv.cd_maxtrk = ald_get_maxno(DRIFILE_BGM) + 1;
return OK;
}
+1 -1
View File
@@ -27,7 +27,7 @@
static int frame_of_getpos = -1;
int cdrom_init(char *name) {
int cdrom_init(char *playlist) {
return OK;
}
+3
View File
@@ -64,6 +64,9 @@ static int start_time;
static int cdrom_init(char *playlist_path) {
char buf[256];
if (!playlist_path || !playlist_path[0])
return NG;
FILE *fp = fopen(playlist_path, "r");
if (fp) {
// Skip the first line
+4 -5
View File
@@ -38,11 +38,10 @@ extern cdromdevice_t cdrom_mp3;
#define NATIVE_CD_DEVICE &cdrom_mp3
#endif
static char *dev = CDROM_DEVICE;
static char *playlist = DEFAULT_PLAYLIST_PATH;
void muscd_set_devicename(const char *name) {
if (0 == strcmp("none", name)) dev = NULL;
else dev = strdup(name);
void muscd_set_playlist(const char *name) {
playlist = strdup(name);
}
int muscd_init(void) {
@@ -52,7 +51,7 @@ int muscd_init(void) {
} else {
prv.cddev = NATIVE_CD_DEVICE;
}
prv.cddev->init(dev);
prv.cddev->init(playlist);
prv.cd_current_track = 0;
return OK;
}
+1 -1
View File
@@ -27,7 +27,7 @@
#include "portab.h"
#include "ald_manager.h"
void muscd_set_devicename(const char *);
void muscd_set_playlist(const char *);
int muscd_init(void);
int muscd_init_bgm(DRIFILETYPE type, int base_no);
int muscd_exit(void);
+9 -6
View File
@@ -114,7 +114,7 @@ static void sys35_usage(boolean verbose) {
puts(" -game game : enable game-specific hacks");
puts(" -saveformat fmt : save file format. 'xsystem35', 'system36' or 'system39' (default)");
puts(" -renderer name : set rendering driver name to 'name'");
puts(" -devcd device : set cdrom device name to 'device'");
puts(" -playlist file : load CD playlist from 'file'");
puts(" -devmidi device : set midi device name to 'device'");
puts(" -M? : select output midi methos");
@@ -275,9 +275,9 @@ static void sys35_ParseOption(int *argc, char **argv) {
debugger_mode = DEBUGGER_DAP;
} else if (0 == strcmp(argv[i], "-renderer")) {
render_driver = argv[i + 1];
} else if (0 == strcmp(argv[i], "-devcd")) {
} else if (0 == strcmp(argv[i], "-playlist") || 0 == strcmp(argv[i], "-devcd")) {
if (argv[i + 1] != NULL) {
muscd_set_devicename(argv[i + 1]);
muscd_set_playlist(argv[i + 1]);
}
} else if (0 == strcmp(argv[i], "-devmidi")) {
if (argv[i + 1] != NULL) {
@@ -374,11 +374,14 @@ static void check_profile() {
render_driver = param;
}
/* CD-ROM device name の設定 */
param = get_profile("cdrom_device");
/* CD-ROM playlist */
param = get_profile("playlist");
if (!param)
param = get_profile("cdrom_device"); // For backwards compatibility
if (param) {
muscd_set_devicename(param);
muscd_set_playlist(param);
}
/* joystick device name の設定 */
param = get_profile("joy_device");
if (param) {