summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-14 22:43:50 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-14 22:43:50 +0000
commit637c591d7e0f964693f4c6b7d86f74afd22c07e0 (patch)
tree1ad433cf599144e3d298e650939e060e1f79ed51 /libmpdemux
parent4182c79ba4296d9d3e827f2d2b4fdab4b5858d46 (diff)
downloadmpv-637c591d7e0f964693f4c6b7d86f74afd22c07e0.tar.bz2
mpv-637c591d7e0f964693f4c6b7d86f74afd22c07e0.tar.xz
cosmetical reformatting
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19095 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/dvbin.c74
1 files changed, 35 insertions, 39 deletions
diff --git a/libmpdemux/dvbin.c b/libmpdemux/dvbin.c
index ccb069de71..a58402731e 100644
--- a/libmpdemux/dvbin.c
+++ b/libmpdemux/dvbin.c
@@ -649,24 +649,24 @@ static int dvb_streaming_start(dvb_priv_t *priv, struct stream_priv_s *opts, int
priv->is_on = 0;
- i = 0;
- while((channel == NULL) && i < priv->list->NUM_CHANNELS)
- {
- if(! strcmp(priv->list->channels[i].name, progname))
- channel = &(priv->list->channels[i]);
+ i = 0;
+ while((channel == NULL) && i < priv->list->NUM_CHANNELS)
+ {
+ if(! strcmp(priv->list->channels[i].name, progname))
+ channel = &(priv->list->channels[i]);
- i++;
- }
+ i++;
+ }
- if(channel != NULL)
- {
- priv->list->current = i-1;
- mp_msg(MSGT_DEMUX, MSGL_V, "PROGRAM NUMBER %d: name=%s, freq=%u\n", i-1, channel->name, channel->freq);
- }
- else
- {
- mp_msg(MSGT_DEMUX, MSGL_ERR, "\n\nDVBIN: no such channel \"%s\"\n\n", progname);
- return 0;
+ if(channel != NULL)
+ {
+ priv->list->current = i-1;
+ mp_msg(MSGT_DEMUX, MSGL_V, "PROGRAM NUMBER %d: name=%s, freq=%u\n", i-1, channel->name, channel->freq);
+ }
+ else
+ {
+ mp_msg(MSGT_DEMUX, MSGL_ERR, "\n\nDVBIN: no such channel \"%s\"\n\n", progname);
+ return 0;
}
@@ -761,7 +761,7 @@ static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
*file_format = DEMUXER_TYPE_MPEG_TS;
- return STREAM_OK;
+ return STREAM_OK;
}
#define MAX_CARDS 4
@@ -802,20 +802,20 @@ dvb_config_t *dvb_get_config(void)
}
switch(type)
- {
- case TUNER_TER:
- conf_file = get_path("channels.conf.ter");
- break;
- case TUNER_CBL:
- conf_file = get_path("channels.conf.cbl");
- break;
- case TUNER_SAT:
- conf_file = get_path("channels.conf.sat");
- break;
- case TUNER_ATSC:
- conf_file = get_path("channels.conf.atsc");
- break;
- }
+ {
+ case TUNER_TER:
+ conf_file = get_path("channels.conf.ter");
+ break;
+ case TUNER_CBL:
+ conf_file = get_path("channels.conf.cbl");
+ break;
+ case TUNER_SAT:
+ conf_file = get_path("channels.conf.sat");
+ break;
+ case TUNER_ATSC:
+ conf_file = get_path("channels.conf.atsc");
+ break;
+ }
if((access(conf_file, F_OK | R_OK) != 0))
conf_file = get_path("channels.conf");
@@ -828,18 +828,18 @@ dvb_config_t *dvb_get_config(void)
tmp = realloc(conf->cards, size);
if(tmp == NULL)
- {
+ {
fprintf(stderr, "DVB_CONFIG, can't realloc %d bytes, skipping\n", size);
continue;
- }
+ }
cards = tmp;
name = (char*) malloc(20);
if(name==NULL)
- {
+ {
fprintf(stderr, "DVB_CONFIG, can't realloc 20 bytes, skipping\n");
continue;
- }
+ }
conf->cards = cards;
conf->cards[conf->count].devno = i;
@@ -872,7 +872,3 @@ stream_info_t stream_info_dvb = {
&stream_opts,
1 // Urls are an option string
};
-
-
-
-