summaryrefslogtreecommitdiffstats
path: root/libmenu
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-12 23:01:49 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-12 23:01:49 +0000
commit0b162b1a83008458f26999f90a14f8fb0a58fff7 (patch)
tree3c683b4f951a0d3272add5374b6df492619f6c29 /libmenu
parentbcf142a30f097c7e183ef959dd540b9d225b729d (diff)
downloadmpv-0b162b1a83008458f26999f90a14f8fb0a58fff7.tar.bz2
mpv-0b162b1a83008458f26999f90a14f8fb0a58fff7.tar.xz
cosmetics: partially reformatted this monstruosity
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25384 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu')
-rw-r--r--libmenu/menu_dvbin.c64
1 files changed, 31 insertions, 33 deletions
diff --git a/libmenu/menu_dvbin.c b/libmenu/menu_dvbin.c
index 10556f2a86..b43cc232c2 100644
--- a/libmenu/menu_dvbin.c
+++ b/libmenu/menu_dvbin.c
@@ -83,8 +83,8 @@ static int fill_channels_menu(menu_t *menu, dvb_channels_list *dvb_list_ptr)
mpriv->level = 2;
if(dvb_list_ptr == NULL)
- {
- mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: LIST NULL PTR, quit\n");
+ {
+ mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: LIST NULL PTR, quit\n");
n = 1;
if((elem = calloc(1, sizeof(list_entry_t))) != NULL)
{
@@ -94,10 +94,10 @@ static int fill_channels_menu(menu_t *menu, dvb_channels_list *dvb_list_ptr)
menu_list_add_entry(menu, elem);
}
return 1;
- }
- for(n = 0; n < dvb_list_ptr->NUM_CHANNELS; n++)
- {
- channel = &(dvb_list_ptr->channels[n]);
+ }
+ for(n = 0; n < dvb_list_ptr->NUM_CHANNELS; n++)
+ {
+ channel = &(dvb_list_ptr->channels[n]);
if((elem = calloc(1, sizeof(list_entry_t))) != NULL)
{
elem->p.next = NULL;
@@ -110,7 +110,6 @@ static int fill_channels_menu(menu_t *menu, dvb_channels_list *dvb_list_ptr)
{
mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_menu: fill_menu: couldn't malloc %d bytes for menu item: %s, exit\n",
sizeof(list_entry_t), strerror(errno));
-
break;
}
}
@@ -127,27 +126,26 @@ static int fill_cards_menu(menu_t *menu, dvb_config_t *conf)
for(n = 0; n < conf->count; n++)
{
if((elem = calloc(1, sizeof(list_entry_t))) != NULL)
- {
- elem->p.next = NULL;
+ {
+ elem->p.next = NULL;
elem->p.txt = strdup(conf->cards[n].name);
- elem->num = n;
+ elem->num = n;
- if(n == 0)
- elem->p.prev = NULL;
+ if(n == 0)
+ elem->p.prev = NULL;
- menu_list_add_entry(menu, elem);
- }
- else
- {
+ menu_list_add_entry(menu, elem);
+ }
+ else
+ {
fprintf(stderr, "dvb_menu: fill_menu: couldn't malloc %d bytes for menu item: %s, exit\n",
- sizeof(list_entry_t), strerror(errno));
-
- if(n)
+ sizeof(list_entry_t), strerror(errno));
+ if(n)
return 1;
-
- return 0;
- }
- }
+
+ return 0;
+ }
+ }
return n;
}
@@ -168,7 +166,7 @@ static int fill_menu(menu_t* menu)
elem->p.txt = strdup("NO DVB configuration present!");
menu_list_add_entry(menu, elem);
- return 1;
+ return 1;
}
return 0;
}
@@ -212,15 +210,15 @@ static void read_cmd(menu_t* menu, int cmd)
else
sprintf(cmd_name, "loadfile 'dvb://%d@%s'", mpriv->card+1, elem->p.txt);
- c = mp_input_parse_cmd(cmd_name);
- free(cmd_name);
- if(c)
- {
- if (mpriv->auto_close)
- mp_input_queue_cmd (mp_input_parse_cmd ("menu hide"));
- mp_input_queue_cmd(c);
- }
- }
+ c = mp_input_parse_cmd(cmd_name);
+ free(cmd_name);
+ if(c)
+ {
+ if(mpriv->auto_close)
+ mp_input_queue_cmd (mp_input_parse_cmd ("menu hide"));
+ mp_input_queue_cmd(c);
+ }
+ }
}
break;