From: Darren S. <ds...@us...> - 2006-12-19 19:10:54
|
Update of /cvsroot/xine/xine-lib/src/input In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14035/src/input Modified Files: input_cdda.c input_dvd.c input_file.c input_pvr.c input_v4l.c input_vcd.c Log Message: Mark string-type configuration items according to whether they're plain strings or names of files, device nodes or directories. This information is available to front ends (via .num_value) so that they can present file/dir-open dialogue boxes if they so choose. Subtitle font selection is split up due to this. Index: input_cdda.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/input_cdda.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- input_cdda.c 11 Aug 2006 21:40:02 -0000 1.90 +++ input_cdda.c 19 Dec 2006 19:10:51 -0000 1.91 @@ -2675,8 +2675,8 @@ this->mrls_allocated_entries = 0; this->ip = NULL; - this->cdda_device = config->register_string(config, "media.audio_cd.device", - DEFAULT_CDDA_DEVICE, + this->cdda_device = config->register_filename(config, "media.audio_cd.device", + DEFAULT_CDDA_DEVICE, XINE_CONFIG_STRING_IS_DEVICE_NAME, _("device used for CD audio"), _("The path to the device, usually a " "CD or DVD drive, which you intend to use " @@ -2704,8 +2704,8 @@ "title and track information from."), XINE_CONFIG_SECURITY, port_changed_cb, (void *) this); - config->register_string(config, "media.audio_cd.cddb_cachedir", - (_cdda_cddb_get_default_location()), + config->register_filename(config, "media.audio_cd.cddb_cachedir", + (_cdda_cddb_get_default_location()), XINE_CONFIG_STRING_IS_DIRECTORY_NAME, _("CDDB cache directory"), _("The replies from the CDDB server will be " "cached in this directory.\nThis setting is security critical, because files " "with uncontrollable names will be created in this directory. Be sure to use " Index: input_dvd.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/input_dvd.c,v retrieving revision 1.211 retrieving revision 1.212 diff -u -r1.211 -r1.212 --- input_dvd.c 29 Oct 2006 19:39:39 -0000 1.211 +++ input_dvd.c 19 Dec 2006 19:10:51 -0000 1.212 @@ -1779,9 +1779,9 @@ this->ip = NULL; - this->dvd_device = config->register_string(config, + this->dvd_device = config->register_filename(config, "media.dvd.device", - DVD_PATH, + DVD_PATH, XINE_CONFIG_STRING_IS_DEVICE_NAME, _("device used for DVD playback"), _("The path to the device, usually a " "DVD drive, which you intend to use for playing DVDs."), @@ -1799,8 +1799,9 @@ char *css_cache_default, *css_cache; int mode; - raw_device = config->register_string(config, "media.dvd.raw_device", - RDVD_PATH, _("raw device set up for DVD access"), + raw_device = config->register_filename(config, "media.dvd.raw_device", + RDVD_PATH, XINE_CONFIG_STRING_IS_DEVICE_NAME, + _("raw device set up for DVD access"), _("If this points to a raw device connected to your " "DVD device, xine will use the raw device for playback. " "This has the advantage of being slightly faster and " @@ -1822,7 +1823,7 @@ css_cache_default = (char *)malloc(strlen(xine_get_homedir()) + 10); sprintf(css_cache_default, "%s/.dvdcss/", xine_get_homedir()); - css_cache = config->register_string(config, "media.dvd.css_cache_path", css_cache_default, + css_cache = config->register_filename(config, "media.dvd.css_cache_path", css_cache_default, XINE_CONFIG_STRING_IS_DIRECTORY_NAME, _("path to the title key cache"), _("Since cracking the copy protection of scrambled DVDs can " "be quite time consuming, libdvdcss will cache the cracked " Index: input_file.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/input_file.c,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- input_file.c 1 Oct 2006 20:14:43 -0000 1.117 +++ input_file.c 19 Dec 2006 19:10:51 -0000 1.118 @@ -1027,8 +1027,8 @@ if(getcwd(current_dir, sizeof(current_dir)) == NULL) strcpy(current_dir, "."); - this->origin_path = config->register_string(config, "media.files.origin_path", - current_dir, + this->origin_path = config->register_filename(config, "media.files.origin_path", + current_dir, XINE_CONFIG_STRING_IS_DIRECTORY_NAME, _("file browsing start location"), _("The browser to select the file to play will " "start at this location."), Index: input_pvr.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/input_pvr.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- input_pvr.c 10 Jul 2006 22:08:15 -0000 1.62 +++ input_pvr.c 19 Dec 2006 19:10:51 -0000 1.63 @@ -1548,9 +1548,9 @@ this->xine = xine; this->config = xine->config; - this->devname = this->config->register_string(this->config, + this->devname = this->config->register_filename(this->config, "media.wintv_pvr.device", - PVR_DEVICE, + PVR_DEVICE, XINE_CONFIG_STRING_IS_DEVICE_NAME, _("device used for WinTV-PVR 250/350 (pvr plugin)"), _("The path to the device of your WinTV card."), 10, NULL, Index: input_v4l.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/input_v4l.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- input_v4l.c 10 Jul 2006 22:08:16 -0000 1.58 +++ input_v4l.c 19 Dec 2006 19:10:51 -0000 1.59 @@ -1907,8 +1907,8 @@ this->input_class.dispose = v4l_class_dispose; this->input_class.eject_media = NULL; - config->register_string (config, "media.video4linux.video_device", - VIDEO_DEV, + config->register_filename (config, "media.video4linux.video_device", + VIDEO_DEV, XINE_CONFIG_STRING_IS_DEVICE_NAME, _("v4l video device"), _("The path to your Video4Linux video device."), 10, NULL, NULL); @@ -1933,8 +1933,8 @@ this->input_class.dispose = v4l_class_dispose; this->input_class.eject_media = NULL; - config->register_string (config, "media.video4linux.radio_device", - RADIO_DEV, + config->register_filename (config, "media.video4linux.radio_device", + RADIO_DEV, XINE_CONFIG_STRING_IS_DEVICE_NAME, _("v4l radio device"), _("The path to your Video4Linux radio device."), 10, NULL, NULL); Index: input_vcd.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/input_vcd.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- input_vcd.c 10 Jul 2006 22:08:16 -0000 1.85 +++ input_vcd.c 19 Dec 2006 19:10:51 -0000 1.86 @@ -1094,7 +1094,7 @@ this->input_class.dispose = vcd_class_dispose; this->input_class.eject_media = vcd_class_eject_media; - this->device = config->register_string (config, "media.vcd.device", CDROM, + this->device = config->register_filename (config, "media.vcd.device", CDROM, XINE_CONFIG_STRING_IS_DEVICE_NAME, _("device used for VCD playback"), _("The path to the device, usually a CD or DVD drive, " "you intend to play your VideoCDs with."), |