summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_cdda.c26
-rw-r--r--src/input/input_dvb.c20
-rw-r--r--src/input/input_dvd.c34
-rw-r--r--src/input/input_file.c8
-rw-r--r--src/input/input_http.c14
-rw-r--r--src/input/input_mms.c8
-rw-r--r--src/input/input_pvr.c12
-rw-r--r--src/input/input_v4l.c16
-rw-r--r--src/input/input_vcd.c4
-rw-r--r--src/input/net_buf_ctrl.c4
-rw-r--r--src/input/vcd/xineplug_inp_vcd.c18
11 files changed, 82 insertions, 82 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 9daac2bae..e652ee038 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
* Compact Disc Digital Audio (CDDA) Input Plugin
* by Mike Melanson (melanson@pcisys.net)
*
- * $Id: input_cdda.c,v 1.68 2004/12/12 00:41:22 miguelfreitas Exp $
+ * $Id: input_cdda.c,v 1.69 2004/12/12 22:01:05 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1897,7 +1897,7 @@ static int cdda_open(cdda_input_plugin_t *this_gen,
if (this_gen->stream) {
int speed;
speed = this_gen->stream->xine->config->lookup_entry(this_gen->stream->xine->config,
- "input.drive_slowdown")->num_value;
+ "media.audio_cd.drive_slowdown")->num_value;
if (speed && ioctl(fd, CDROM_SELECT_SPEED, speed) != 0)
xprintf(this_gen->stream->xine, XINE_VERBOSITY_DEBUG,
"input_cdda: setting drive speed to %d failed\n", speed);
@@ -2063,7 +2063,7 @@ static int cdda_close(cdda_input_plugin_t *this_gen) {
if (this_gen->stream) {
int speed;
speed = this_gen->stream->xine->config->lookup_entry(this_gen->stream->xine->config,
- "input.drive_slowdown")->num_value;
+ "media.audio_cd.drive_slowdown")->num_value;
if (speed && ioctl(this_gen->fd, CDROM_SELECT_SPEED, 0) != 0)
xprintf(this_gen->stream->xine, XINE_VERBOSITY_DEBUG,
"input_cdda: setting drive speed to normal failed\n");
@@ -2513,19 +2513,19 @@ static input_plugin_t *cdda_class_get_instance (input_class_t *cls_gen, xine_str
/*
* Lookup config entries.
*/
- if(xine_config_lookup_entry(this->stream->xine, "input.cdda_use_cddb",
+ if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.use_cddb",
&enable_entry))
enable_cddb_changed_cb(class, &enable_entry);
- if(xine_config_lookup_entry(this->stream->xine, "input.cdda_cddb_server",
+ if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.cddb_server",
&server_entry))
server_changed_cb(class, &server_entry);
- if(xine_config_lookup_entry(this->stream->xine, "input.cdda_cddb_port",
+ if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.cddb_port",
&port_entry))
port_changed_cb(class, &port_entry);
- if(xine_config_lookup_entry(this->stream->xine, "input.cdda_cddb_cachedir",
+ if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.cddb_cachedir",
&cachedir_entry))
cachedir_changed_cb(class, &cachedir_entry);
@@ -2581,7 +2581,7 @@ static void *init_plugin (xine_t *xine, void *data) {
this->mrls_allocated_entries = 0;
this->ip = NULL;
- this->cdda_device = config->register_string(config, "input.cdda_device",
+ this->cdda_device = config->register_string(config, "media.audio_cd.device",
DEFAULT_CDDA_DEVICE,
_("device used for CD audio"),
_("The path to the device, usually a "
@@ -2589,7 +2589,7 @@ static void *init_plugin (xine_t *xine, void *data) {
"for playing audio CDs."),
10, cdda_device_cb, (void *) this);
- config->register_bool(config, "input.cdda_use_cddb", 1,
+ config->register_bool(config, "media.audio_cd.use_cddb", 1,
_("query CDDB"), _("Enables CDDB queries, which will give you "
"convenient title and track names for your audio CDs.\n"
"Keep in mind that, unless you use your own private CDDB, this information "
@@ -2597,7 +2597,7 @@ static void *init_plugin (xine_t *xine, void *data) {
"of your listening habits."),
10, enable_cddb_changed_cb, (void *) this);
- config->register_string(config, "input.cdda_cddb_server", CDDB_SERVER,
+ config->register_string(config, "media.audio_cd.cddb_server", CDDB_SERVER,
_("CDDB server name"), _("The CDDB server used to retrieve the "
"title and track information from.\nThis setting is security critical, "
"because the sever will receive information about your listening habits "
@@ -2605,12 +2605,12 @@ static void *init_plugin (xine_t *xine, void *data) {
"a server you can trust."), XINE_CONFIG_SECURITY,
server_changed_cb, (void *) this);
- config->register_num(config, "input.cdda_cddb_port", CDDB_PORT,
+ config->register_num(config, "media.audio_cd.cddb_port", CDDB_PORT,
_("CDDB server port"), _("The server port used to retrieve the "
"title and track information from."), XINE_CONFIG_SECURITY,
port_changed_cb, (void *) this);
- config->register_string(config, "input.cdda_cddb_cachedir",
+ config->register_string(config, "media.audio_cd.cddb_cachedir",
(_cdda_cddb_get_default_location()),
_("CDDB cache directory"), _("The replies from the CDDB server will be "
"cached in this directory.\nThis setting is security critical, because files "
@@ -2619,7 +2619,7 @@ static void *init_plugin (xine_t *xine, void *data) {
cachedir_changed_cb, (void *) this);
#ifdef CDROM_SELECT_SPEED
- config->register_num(config, "input.drive_slowdown", 4,
+ config->register_num(config, "media.audio_cd.drive_slowdown", 4,
_("slow down disc drive to this speed factor"),
_("Since some CD or DVD drives make some really "
"loud noises because of the fast disc rotation, "
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 46ecd089a..c1d59729a 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -1186,7 +1186,7 @@ static void do_eit(dvb_input_plugin_t *this)
/* Let's get the EPG data only in the wanted language. */
- xine_config_lookup_entry(this->stream->xine, "input.dvd_language", &language);
+ xine_config_lookup_entry(this->stream->xine, "media.dvd.language", &language);
if (language.str_value && *language.str_value &&
strncmp(language.str_value, &eit[1], 2)) {
@@ -1588,7 +1588,7 @@ static void do_record (dvb_input_plugin_t *this) {
free(t);
strftime(dates,63,"%F_%H%M",tma);
- if (xine_config_lookup_entry(this->stream->xine, "misc.save_dir", &savedir)){
+ if (xine_config_lookup_entry(this->stream->xine, "media.capture.save_dir", &savedir)){
if(strlen(savedir.str_value)>1){
if(opendir(savedir.str_value)==NULL){
snprintf (filename, 256, "%s/%s_%s.ts",xine_get_homedir(),this->channels[this->channel].name, dates);
@@ -2283,7 +2283,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen)
this->stream->osd_renderer->filled_rect(this->background, 1, 1, 1000, 600, 4);
this->displaying=0;
/* zoom for 4:3 in a 16:9 window */
- config->register_bool(config, "input.dvbzoom",
+ config->register_bool(config, "media.dvb.zoom",
0,
_("use DVB 'center cutout' (zoom)"),
_("This will allow fullscreen "
@@ -2291,13 +2291,13 @@ static int dvb_plugin_open(input_plugin_t * this_gen)
"transmitted in a 16:9 frame."),
0, &dvb_zoom_cb, (void *) this);
- if (xine_config_lookup_entry(this->stream->xine, "input.dvbzoom", &zoomdvb))
+ if (xine_config_lookup_entry(this->stream->xine, "media.dvb.zoom", &zoomdvb))
dvb_zoom_cb((input_plugin_t *) this, &zoomdvb);
- if (xine_config_lookup_entry(this->stream->xine, "input.dvb_last_channel_enable", &lastchannel))
+ if (xine_config_lookup_entry(this->stream->xine, "media.dvb.remember_channel", &lastchannel))
if (lastchannel.num_value){
/* Remember last watched channel. never show this entry*/
- config->update_num(config, "input.dvb_last_channel_watched", this->channel+1);
+ config->update_num(config, "media.dvb.last_channel", this->channel+1);
}
/*
@@ -2426,10 +2426,10 @@ static char **dvb_class_get_autoplay_list(input_class_t * this_gen,
}
fclose (f);
- if (xine_config_lookup_entry(class->xine, "input.dvb_last_channel_enable", &lastchannel_enable))
+ if (xine_config_lookup_entry(class->xine, "media.dvb.remember_channel", &lastchannel_enable))
if (lastchannel_enable.num_value){
num_channels++;
- if (xine_config_lookup_entry(class->xine, "input.dvb_last_channel_watched", &lastchannel))
+ if (xine_config_lookup_entry(class->xine, "media.dvb.last_channel", &lastchannel))
default_channel = lastchannel.num_value;
}
@@ -2504,7 +2504,7 @@ static void *init_class (xine_t *xine, void *data) {
xprintf(this->xine,XINE_VERBOSITY_DEBUG,"init class succeeded\n");
/* Enable remembering of last watched channel */
- config->register_bool(config, "input.dvb_last_channel_enable",
+ config->register_bool(config, "media.dvb.remember_channel",
1,
_("Remember last DVB channel watched"),
_("On autoplay, xine will remember and "
@@ -2512,7 +2512,7 @@ static void *init_class (xine_t *xine, void *data) {
0, NULL, NULL);
/* Enable remembering of last watched channel never show this entry*/
- config->register_num(config, "input.dvb_last_channel_watched",
+ config->register_num(config, "media.dvb.last_channel",
-1,
_("Remember last DVB channel watched"),
_("If enabled, xine will remember and "
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 6dc24c241..f69890bae 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_dvd.c,v 1.194 2004/12/12 13:51:29 valtri Exp $
+ * $Id: input_dvd.c,v 1.195 2004/12/12 22:01:05 mroi Exp $
*
*/
@@ -951,7 +951,7 @@ static void dvd_handle_events(dvd_input_plugin_t *this) {
break;
case XINE_EVENT_INPUT_NEXT:
{
- cfg_entry_t* entry = config->lookup_entry(config, "input.dvd_skip_behaviour");
+ cfg_entry_t* entry = config->lookup_entry(config, "media.dvd.skip_behaviour");
int title = 0, part = 0;
switch (entry->num_value) {
case 0: /* skip by program */
@@ -970,7 +970,7 @@ static void dvd_handle_events(dvd_input_plugin_t *this) {
break;
case XINE_EVENT_INPUT_PREVIOUS:
{
- cfg_entry_t *entry = config->lookup_entry(config, "input.dvd_skip_behaviour");
+ cfg_entry_t *entry = config->lookup_entry(config, "media.dvd.skip_behaviour");
int title = 0, part = 0;
switch (entry->num_value) {
case 0: /* skip by program */
@@ -1342,7 +1342,7 @@ static int dvd_parse_try_open(dvd_input_plugin_t *this, const char *locator)
dvd_input_class_t *class = (dvd_input_class_t*)this->input_plugin.input_class;
xine_cfg_entry_t raw_device;
if (xine_config_lookup_entry(this->stream->xine,
- "input.dvd_raw_device", &raw_device))
+ "media.dvd.raw_device", &raw_device))
xine_setenv("DVDCSS_RAW_DEVICE", raw_device.str_value, 1);
intended_dvd_device = class->dvd_device;
}
@@ -1441,22 +1441,22 @@ static int dvd_plugin_open (input_plugin_t *this_gen) {
dvdnav_get_title_string(this->dvdnav, &this->dvd_name);
/* Set region code */
- if (xine_config_lookup_entry (this->stream->xine, "input.dvd_region",
+ if (xine_config_lookup_entry (this->stream->xine, "media.dvd.region",
&region_entry))
region_changed_cb (class, &region_entry);
/* Set languages */
- if (xine_config_lookup_entry (this->stream->xine, "input.dvd_language",
+ if (xine_config_lookup_entry (this->stream->xine, "media.dvd.language",
&lang_entry))
language_changed_cb (class, &lang_entry);
/* Set cache usage */
- if (xine_config_lookup_entry(this->stream->xine, "input.dvd_use_readahead",
+ if (xine_config_lookup_entry(this->stream->xine, "media.dvd.readahead",
&cache_entry))
read_ahead_cb(class, &cache_entry);
/* Set seek mode */
- if (xine_config_lookup_entry(this->stream->xine, "input.dvd_seek_behaviour",
+ if (xine_config_lookup_entry(this->stream->xine, "media.dvd.seek_behaviour",
&cache_entry))
seek_mode_cb(class, &cache_entry);
@@ -1692,7 +1692,7 @@ static void *init_class (xine_t *xine, void *data) {
this->ip = NULL;
this->dvd_device = config->register_string(config,
- "input.dvd_device",
+ "media.dvd.device",
DVD_PATH,
_("device used for DVD playback"),
_("The path to the device, usually a "
@@ -1706,7 +1706,7 @@ static void *init_class (xine_t *xine, void *data) {
char *css_cache_default, *css_cache;
int mode;
- raw_device = config->register_string(config, "input.dvd_raw_device",
+ raw_device = config->register_string(config, "media.dvd.raw_device",
RDVD_PATH, _("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. "
@@ -1720,7 +1720,7 @@ static void *init_class (xine_t *xine, void *data) {
10, NULL, NULL);
if (raw_device) xine_setenv("DVDCSS_RAW_DEVICE", raw_device, 0);
- mode = config->register_enum(config, "input.css_decryption_method", 0,
+ mode = config->register_enum(config, "media.dvd.css_decryption_method", 0,
decrypt_modes, _("CSS decryption method"),
_("Selects the decryption method libdvdcss will use to descramble "
"copy protected DVDs. Try the various methods, if you have problems "
@@ -1729,7 +1729,7 @@ static void *init_class (xine_t *xine, void *data) {
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, "input.css_cache_path", css_cache_default,
+ css_cache = config->register_string(config, "media.dvd.css_cache_path", css_cache_default,
_("path to the title key cache"),
_("Since cracking the copy protection of scrambled DVDs can "
"be quite time consuming, libdvdcss will cache the cracked "
@@ -1751,28 +1751,28 @@ static void *init_class (xine_t *xine, void *data) {
dlclose(dvdcss);
}
- config->register_num(config, "input.dvd_region",
+ config->register_num(config, "media.dvd.region",
1,
_("region the DVD player claims to be in (1 to 8)"),
_("This only needs to be changed if your DVD jumps to a screen "
"complaining about a wrong region code. It has nothing to do with "
"the region code set in DVD drives, this is purely software."),
0, region_changed_cb, this);
- config->register_string(config, "input.dvd_language",
+ config->register_string(config, "media.dvd.language",
"en",
_("default language for DVD playback"),
_("xine tries to use this language as a default for DVD playback. "
"As far as the DVD supports it, menus and audio tracks will be presented "
"in this language.\nThe value must be a two character ISO639 language code."),
0, language_changed_cb, this);
- config->register_bool(config, "input.dvd_use_readahead",
+ config->register_bool(config, "media.dvd.readahead",
1,
_("read-ahead caching"),
_("xine can use a read ahead cache for DVD drive access.\n"
"This may lead to jerky playback on slow drives, but it improves the impact "
"of the DVD layer change on faster drives."),
10, read_ahead_cb, this);
- config->register_enum(config, "input.dvd_skip_behaviour", 0,
+ config->register_enum(config, "media.dvd.skip_behaviour", 0,
skip_modes,
_("unit for the skip action"),
_("You can configure the behaviour when issuing a skip command (using the skip "
@@ -1788,7 +1788,7 @@ static void *init_class (xine_t *xine, void *data) {
"will skip a DVD title, which is a structural unit representing entire "
"features on the DVD"),
20, NULL, NULL);
- config->register_enum(config, "input.dvd_seek_behaviour", 0,
+ config->register_enum(config, "media.dvd.seek_behaviour", 0,
seek_modes,
_("unit for seeking"),
_("You can configure the domain spanned by the seek slider. The individual "
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 9e761f3cd..9c7cf24fc 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_file.c,v 1.96 2004/09/02 19:56:42 valtri Exp $
+ * $Id: input_file.c,v 1.97 2004/12/12 22:01:06 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -553,7 +553,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen,
/* Store new origin path */
__try_again_from_home:
- this->config->update_string(this->config, "input.file_origin_path", current_dir);
+ this->config->update_string(this->config, "media.files.origin_path", current_dir);
if(strcasecmp(current_dir, "/"))
snprintf(current_dir_slashed, sizeof(current_dir_slashed), "%s/", current_dir);
@@ -867,7 +867,7 @@ static void *init_plugin (xine_t *xine, void *data) {
if(getcwd(current_dir, sizeof(current_dir)) == NULL)
strcpy(current_dir, ".");
- this->origin_path = config->register_string(config, "input.file_origin_path",
+ this->origin_path = config->register_string(config, "media.files.origin_path",
current_dir,
_("file browsing start location"),
_("The browser to select the file to play will "
@@ -876,7 +876,7 @@ static void *init_plugin (xine_t *xine, void *data) {
}
this->show_hidden_files = config->register_bool(config,
- "input.file_hidden_files",
+ "media.files.show_hidden_files",
0, _("list hidden files"),
_("If enabled, the browser to select the file to "
"play will also show hidden files."),
diff --git a/src/input/input_http.c b/src/input/input_http.c
index a44c662f2..fbd5d9d87 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -19,7 +19,7 @@
*
* input plugin for http network streams
*
- * $Id: input_http.c,v 1.100 2004/12/01 22:55:31 tmattern Exp $
+ * $Id: input_http.c,v 1.101 2004/12/12 22:01:06 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1045,26 +1045,26 @@ static void *init_class (xine_t *xine, void *data) {
* proxy settings
*/
this->proxyhost = config->register_string(config,
- "input.http_proxy_host", proxy_env ? this->proxyhost_env : "",
+ "media.network.http_proxy_host", proxy_env ? this->proxyhost_env : "",
_("HTTP proxy host"), _("The hostname of the HTTP proxy."), 10,
proxy_host_change_cb, (void *) this);
this->proxyport = config->register_num(config,
- "input.http_proxy_port", proxy_env ? this->proxyport_env : DEFAULT_HTTP_PORT,
+ "media.network.http_proxy_port", proxy_env ? this->proxyport_env : DEFAULT_HTTP_PORT,
_("HTTP proxy port"), _("The port number of the HTTP proxy."), 10,
proxy_port_change_cb, (void *) this);
/* registered entries could be empty. Don't ignore envvar */
if(!strlen(this->proxyhost) && (proxy_env && strlen(proxy_env))) {
- config->update_string(config, "input.http_proxy_host", this->proxyhost_env);
- config->update_num(config, "input.http_proxy_port", this->proxyport_env);
+ config->update_string(config, "media.network.http_proxy_host", this->proxyhost_env);
+ config->update_num(config, "media.network.http_proxy_port", this->proxyport_env);
}
this->proxyuser = config->register_string(config,
- "input.http_proxy_user", "", _("HTTP proxy username"),
+ "media.network.http_proxy_user", "", _("HTTP proxy username"),
_("The user name for the HTTP proxy."), 10,
proxy_user_change_cb, (void *) this);
this->proxypassword = config->register_string(config,
- "input.http_proxy_password", "", _("HTTP proxy password"),
+ "media.network.http_proxy_password", "", _("HTTP proxy password"),
_("The password for the HTTP proxy."), 10,
proxy_password_change_cb, (void *) this);
this->noproxylist = config->register_string(config,
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index b4c7289e7..7ed6cf152 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_mms.c,v 1.53 2004/07/20 00:50:11 rockyb Exp $
+ * $Id: input_mms.c,v 1.54 2004/12/12 22:01:06 mroi Exp $
*
* mms input plugin based on work from major mms
*/
@@ -394,7 +394,7 @@ static input_plugin_t *mms_class_get_instance (input_class_t *cls_gen, xine_stre
this->mrl = mrl;
this->nbc = nbc_init (this->stream);
- if (xine_config_lookup_entry (stream->xine, "input.mms_network_bandwidth",
+ if (xine_config_lookup_entry (stream->xine, "media.network.bandwidth",
&bandwidth_entry)) {
bandwidth_changed_cb(cls, &bandwidth_entry);
}
@@ -451,7 +451,7 @@ static void *init_class (xine_t *xine, void *data) {
this->input_class.dispose = mms_class_dispose;
this->input_class.eject_media = NULL;
- xine->config->register_enum(xine->config, "input.mms_network_bandwidth", 10,
+ xine->config->register_enum(xine->config, "media.network.bandwidth", 10,
(char **)mms_bandwidth_strs,
_("network bandwidth"),
_("Specify the bandwidth of your internet connection here. "
@@ -460,7 +460,7 @@ static void *init_class (xine_t *xine, void *data) {
0, bandwidth_changed_cb, (void*) this);
this->protocol = xine->config->register_enum(xine->config,
- "input.mms_protocol",
+ "media.network.mms_protocol",
0,
(char **)mms_protocol_strs,
_("MMS protocol"),
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 2fe965378..f6c8157e9 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -29,7 +29,7 @@
* - may erase files as they get old
*
* requires:
- * - audio.av_sync_method=resample
+ * - audio.synchronization.av_sync_method=resample
* - ivtv driver (01 Jul 2003 cvs is known to work)
*
* MRL:
@@ -38,7 +38,7 @@
* usage:
* xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age>
*
- * $Id: input_pvr.c,v 1.51 2004/10/29 23:11:37 miguelfreitas Exp $
+ * $Id: input_pvr.c,v 1.52 2004/12/12 22:01:06 mroi Exp $
*/
/**************************************************************************
@@ -256,7 +256,7 @@ typedef struct {
* speed in order to regulate fifo usage, that is,
* trying to match the rate of generated data.
*
- * OBS: use with audio.av_sync_method=resample
+ * OBS: use with audio.synchronization.av_sync_method=resample
* ***************************************************
*/
@@ -444,7 +444,7 @@ static off_t pvr_plugin_read (input_plugin_t *this_gen, char *buf, off_t len) {
* - underrun: buffer gets empty. playback will suffer a pausing effect, also discarding
* video frames.
*
- * OBS: use with audio.av_sync_method=resample
+ * OBS: use with audio.synchronization.av_sync_method=resample
*/
static void pvr_adjust_realtime_speed(pvr_input_plugin_t *this, fifo_buffer_t *fifo, int speed ) {
@@ -1428,7 +1428,7 @@ static int pvr_plugin_open (input_plugin_t *this_gen ) {
this->event_queue = xine_event_new_queue (this->stream);
/* enable resample method */
- this->stream->xine->config->update_num(this->stream->xine->config,"audio.av_sync_method",1);
+ this->stream->xine->config->update_num(this->stream->xine->config,"audio.synchronization.av_sync_method",1);
this->pvr_running = 1;
@@ -1546,7 +1546,7 @@ static void *init_plugin (xine_t *xine, void *data) {
this->config = xine->config;
this->devname = this->config->register_string(this->config,
- "input.pvr_device",
+ "media.wintv_pvr.device",
PVR_DEVICE,
_("device used for WinTV-PVR 250/350 (pvr plugin)"),
_("The path to the device of your WinTV card."),
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 0e62343b2..fcf144602 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -209,7 +209,7 @@ typedef struct {
* speed in order to regulate fifo usage, that is,
* trying to match the rate of generated data.
*
- * OBS: use with audio.av_sync_method=resample
+ * OBS: use with audio.synchronization.av_sync_method=resample
* ***************************************************
*/
@@ -757,7 +757,7 @@ static int open_radio_capture_device(v4l_input_plugin_t *this)
lprintf("open_radio_capture_device\n");
entry = this->stream->xine->config->lookup_entry(this->stream->xine->config,
- "input.v4l_radio_device_path");
+ "media.video4linux.radio_device");
if((this->radio_fd = open(entry->str_value, O_RDWR)) < 0) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
@@ -808,7 +808,7 @@ static int open_video_capture_device(v4l_input_plugin_t *this)
lprintf("open_video_capture_device\n");
entry = this->stream->xine->config->lookup_entry(this->stream->xine->config,
- "input.v4l_video_device_path");
+ "media.video4linux.video_device");
/* Try to open the video device */
if((this->video_fd = open(entry->str_value, O_RDWR)) < 0) {
@@ -1683,7 +1683,7 @@ static int v4l_plugin_video_open (input_plugin_t *this_gen)
this->scr_tunning = 0;
/* enable resample method */
- this->stream->xine->config->update_num(this->stream->xine->config, "audio.av_sync_method", 1);
+ this->stream->xine->config->update_num(this->stream->xine->config, "audio.synchronization.av_sync_method", 1);
this->event_queue = xine_event_new_queue (this->stream);
@@ -1771,7 +1771,7 @@ static input_plugin_t *v4l_class_get_video_instance (input_class_t *cls_gen,
return NULL;
entry = this->stream->xine->config->lookup_entry(this->stream->xine->config,
- "input.v4l_video_device_path");
+ "media.video4linux.video_device");
/* Try to open the video device */
if((this->video_fd = open(entry->str_value, O_RDWR)) < 0) {
@@ -1835,7 +1835,7 @@ static input_plugin_t *v4l_class_get_radio_instance (input_class_t *cls_gen,
return NULL;
entry = this->stream->xine->config->lookup_entry(this->stream->xine->config,
- "input.v4l_radio_device_path");
+ "media.video4linux.radio_device");
if((this->radio_fd = open(entry->str_value, O_RDWR)) < 0) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
@@ -1905,7 +1905,7 @@ static void *init_video_class (xine_t *xine, void *data)
this->input_class.dispose = v4l_class_dispose;
this->input_class.eject_media = NULL;
- config->register_string (config, "input.v4l_video_device_path",
+ config->register_string (config, "media.video4linux.video_device",
VIDEO_DEV,
_("v4l video device"),
_("The path to your Video4Linux video device."),
@@ -1931,7 +1931,7 @@ static void *init_radio_class (xine_t *xine, void *data)
this->input_class.dispose = v4l_class_dispose;
this->input_class.eject_media = NULL;
- config->register_string (config, "input.v4l_radio_device_path",
+ config->register_string (config, "media.video4linux.radio_device",
RADIO_DEV,
_("v4l radio device"),
_("The path to your Video4Linux radio device."),
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index eed5e2796..3ea2ed4d0 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_vcd.c,v 1.76 2004/10/20 05:04:00 athp Exp $
+ * $Id: input_vcd.c,v 1.77 2004/12/12 22:01:07 mroi Exp $
*
*/
@@ -1090,7 +1090,7 @@ static void *init_class (xine_t *xine, void *data) {
this->input_class.dispose = vcd_class_dispose;
this->input_class.eject_media = vcd_class_eject_media;
- this->device = config->register_string (config, "input.vcd_device", CDROM,
+ this->device = config->register_string (config, "media.vcd.device", CDROM,
_("device used for VCD playback"),
_("The path to the device, usually a CD or DVD drive, "
"you intend to play your VideoCDs with."),
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index 5869bb21d..f5ad8148d 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -507,13 +507,13 @@ nbc_t *nbc_init (xine_stream_t *stream) {
/* when the FIFO sizes are increased compared to the default configuration,
* apply a factor to the high water mark */
- entry = stream->xine->config->lookup_entry(stream->xine->config, "video.num_buffers");
+ entry = stream->xine->config->lookup_entry(stream->xine->config, "engine.buffers.video_num_buffers");
/* No entry when no video output */
if (entry)
video_fifo_factor = (double)video_fifo->buffer_pool_capacity / (double)entry->num_default;
else
video_fifo_factor = 1.0;
- entry = stream->xine->config->lookup_entry(stream->xine->config, "audio.num_buffers");
+ entry = stream->xine->config->lookup_entry(stream->xine->config, "engine.buffers.audio_num_buffers");
/* When there's no audio output, there's no entry */
if (entry)
audio_fifo_factor = (double)audio_fifo->buffer_pool_capacity / (double)entry->num_default;
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 926a303c2..d8c95aae1 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -1,5 +1,5 @@
/*
- $Id: xineplug_inp_vcd.c,v 1.25 2004/07/25 17:42:55 mroi Exp $
+ $Id: xineplug_inp_vcd.c,v 1.26 2004/12/12 22:01:07 mroi Exp $
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -1655,7 +1655,7 @@ vcd_init (xine_t *xine, void *data)
my_vcd.player.default_autoplay =
config->register_enum(config,
- "vcd.autoplay",
+ "media.vcd.autoplay",
VCDPLAYER_AUTOPLAY_PBC,
(char **) autoplay_modes,
_("default type to use on VCD autoplay"),
@@ -1667,7 +1667,7 @@ _("The play unit to use when none is specified in an MRL, e.g. "
class->vcd_device =
strdup (config->register_string(config,
- "vcd.default_device",
+ "media.vcd.device",
"",
_("default CD drive used for VCD when none given"),
_("What to use if no drive specified. If the setting is empty, xine will scan for CD drives."),
@@ -1677,7 +1677,7 @@ _("What to use if no drive specified. If the setting is empty, xine will scan fo
my_vcd.player.slider_length =
config->register_enum(config,
- "vcd.length_reporting",
+ "media.vcd.length_reporting",
VCDPLAYER_SLIDER_LENGTH_AUTO,
(char **) length_reporting_modes,
_("position slider range"),
@@ -1698,7 +1698,7 @@ _("The range the stream playback position slider represents when playing."),
my_vcd.player.autoadvance =
config->register_bool(config,
- "vcd.autoadvance",
+ "media.vcd.autoadvance",
(int) true,
_("automatically advance track/entry"),
_("If enabled, we should automatically advance to the next entry or track. Used only when playback control (PBC) is disabled."),
@@ -1708,7 +1708,7 @@ _("If enabled, we should automatically advance to the next entry or track. Used
my_vcd.player.show_rejected =
config->register_bool(config,
- "vcd.show_rejected",
+ "media.vcd.show_rejected",
(int) false,
_("show 'rejected' LIDs"),
_("Some playback list IDs (LIDs) are marked not showable, "
@@ -1720,7 +1720,7 @@ _("Some playback list IDs (LIDs) are marked not showable, "
my_vcd.v_config.title_format =
strdup(config->register_string(config,
- "vcd.title_format",
+ "media.vcd.title_format",
"%F - %I %N%L%S, disk %c of %C - %v %A",
_("format string for display banner"),
_("Format used in the GUI Title. Similar to the Unix date "
@@ -1732,7 +1732,7 @@ _("Format used in the GUI Title. Similar to the Unix date "
my_vcd.v_config.comment_format =
strdup(config->register_string(config,
- "vcd.comment_format",
+ "media.vcd.comment_format",
"%P - Track %T",
_("format string for stream comment field"),
_("Format used in the GUI Title. Similar to the Unix date "
@@ -1744,7 +1744,7 @@ _("Format used in the GUI Title. Similar to the Unix date "
vcdplayer_debug =
config->register_num(config,
- "vcd.debug",
+ "media.vcd.debug",
0,
_("debug flag mask"),
_("This integer is a debugging mask when interpreted in binary."),
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 10:41:13 +0000