Mercurial > mplayer.hg

changeset 19090:32facb266b1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetical reformatting
author nicodvb
date Fri, 14 Jul 2006 22:43:50 +0000
parents a4b50a45007c
children 3e416bd2caed
files libmpdemux/dvbin.c
diffstat 1 files changed, 35 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/dvbin.c	Fri Jul 14 22:37:54 2006 +0000
+++ b/libmpdemux/dvbin.c	Fri Jul 14 22:43:50 2006 +0000
@@ -649,24 +649,24 @@
 
 	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 @@
 	
 	*file_format = DEMUXER_TYPE_MPEG_TS;
 
-    return STREAM_OK;
+	return STREAM_OK;
 }
 
 #define MAX_CARDS 4
@@ -802,20 +802,20 @@
 		}
 		
 		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 @@
 		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_opts,
 	1 				// Urls are an option string
 };
-
-
-
-