libeplayer3-arm: insert original blank lines from exteplayer3.git, for better merge

libeplayer3-arm/output/linuxdvb_sh4.c

@@ -70,6 +70,7 @@ if (debug_level >= level) printf("[%s:%s] " fmt, __FILE__, __FUNCTION__, ## x);
 #define linuxdvb_err(x...)
 #endif
 
+
 #define cERR_LINUXDVB_NO_ERROR      0
 #define cERR_LINUXDVB_ERROR        -1
 
@@ -99,84 +100,103 @@ pthread_mutex_t LinuxDVBmutex;
 int LinuxDvbStop(Context_t *context, char *type);
 
 /* ***************************** */
-/* Functions                     */
+/* MISC Functions                */
 /* ***************************** */
 
 void getLinuxDVBMutex(const char *filename __attribute__((unused)), const char *function __attribute__((unused)), int line __attribute__((unused)))
 {
+
 	linuxdvb_printf(250, "requesting mutex\n");
+
 	pthread_mutex_lock(&LinuxDVBmutex);
+
 	linuxdvb_printf(250, "received mutex\n");
 }
 
 void releaseLinuxDVBMutex(const char *filename __attribute__((unused)), const char *function __attribute__((unused)), int line __attribute__((unused)))
 {
 	pthread_mutex_unlock(&LinuxDVBmutex);
+
 	linuxdvb_printf(250, "released mutex\n");
+
 }
 
 int LinuxDvbOpen(Context_t *context __attribute__((unused)), char *type)
 {
 	unsigned char video = !strcmp("video", type);
 	unsigned char audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, "v%d a%d\n", video, audio);
+
 	if (video && videofd < 0)
 	{
 		videofd = open(VIDEODEV, O_RDWR);
+
 		if (videofd < 0)
 		{
 			linuxdvb_err("failed to open %s - errno %d\n", VIDEODEV, errno);
 			linuxdvb_err("%s\n", strerror(errno));
 			return cERR_LINUXDVB_ERROR;
 		}
+
 		if (ioctl(videofd, VIDEO_CLEAR_BUFFER) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("VIDEO_CLEAR_BUFFER: %s\n", strerror(errno));
 		}
+
 		if (ioctl(videofd, VIDEO_SELECT_SOURCE, (void *)VIDEO_SOURCE_MEMORY) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("VIDEO_SELECT_SOURCE: %s\n", strerror(errno));
 		}
+
 		if (ioctl(videofd, VIDEO_SET_STREAMTYPE, (void *)STREAM_TYPE_PROGRAM) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("VIDEO_SET_STREAMTYPE: %s\n", strerror(errno));
 		}
+
 		if (ioctl(videofd, VIDEO_SET_SPEED, DVB_SPEED_NORMAL_PLAY) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("VIDEO_SET_SPEED: %s\n", strerror(errno));
 		}
+
 	}
 	if (audio && audiofd < 0)
 	{
 		audiofd = open(AUDIODEV, O_RDWR);
+
 		if (audiofd < 0)
 		{
 			linuxdvb_err("failed to open %s - errno %d\n", AUDIODEV, errno);
 			linuxdvb_err("%s\n", strerror(errno));
+
 			if (videofd < 0)
 				close(videofd);
 			return cERR_LINUXDVB_ERROR;
 		}
+
 		if (ioctl(audiofd, AUDIO_CLEAR_BUFFER) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("AUDIO_CLEAR_BUFFER: %s\n", strerror(errno));
 		}
+
 		if (ioctl(audiofd, AUDIO_SELECT_SOURCE, (void *)AUDIO_SOURCE_MEMORY) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("AUDIO_SELECT_SOURCE: %s\n", strerror(errno));
 		}
+
 		if (ioctl(audiofd, AUDIO_SET_STREAMTYPE, (void *)STREAM_TYPE_PROGRAM) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("AUDIO_SET_STREAMTYPE: %s\n", strerror(errno));
 		}
 	}
+
 	return cERR_LINUXDVB_NO_ERROR;
 }
 
@@ -184,13 +204,17 @@ int LinuxDvbClose(Context_t *context, char *type)
 {
 	unsigned char video = !strcmp("video", type);
 	unsigned char audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, "v%d a%d\n", video, audio);
+
 	/* closing stand alone is not allowed, so prevent
 	 * user from closing and dont call stop. stop will
 	 * set default values for us (speed and so on).
 	 */
 	LinuxDvbStop(context, type);
+
 	getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 	if (video && videofd != -1)
 	{
 		close(videofd);
@@ -201,6 +225,7 @@ int LinuxDvbClose(Context_t *context, char *type)
 		close(audiofd);
 		audiofd = -1;
 	}
+
 	releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
 	return cERR_LINUXDVB_NO_ERROR;
 }
@@ -209,15 +234,21 @@ int LinuxDvbPlay(Context_t *context, char *type)
 {
 	int ret = cERR_LINUXDVB_NO_ERROR;
 	Writer_t *writer;
+
 	unsigned char video = !strcmp("video", type);
 	unsigned char audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, "v%d a%d\n", video, audio);
+
 	if (video && videofd != -1)
 	{
 		char *Encoding = NULL;
 		context->manager->video->Command(context, MANAGER_GETENCODING, &Encoding);
+
 		linuxdvb_printf(10, "V %s\n", Encoding);
+
 		writer = getWriter(Encoding);
+
 		if (writer == NULL)
 		{
 			linuxdvb_err("cannot found writer for encoding %s using default\n", Encoding);
@@ -238,6 +269,7 @@ int LinuxDvbPlay(Context_t *context, char *type)
 				ret = cERR_LINUXDVB_ERROR;
 			}
 		}
+
 		if (ioctl(videofd, VIDEO_PLAY, NULL) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
@@ -250,8 +282,11 @@ int LinuxDvbPlay(Context_t *context, char *type)
 	{
 		char *Encoding = NULL;
 		context->manager->audio->Command(context, MANAGER_GETENCODING, &Encoding);
+
 		linuxdvb_printf(20, "0 A %s\n", Encoding);
+
 		writer = getWriter(Encoding);
+
 		if (writer == NULL)
 		{
 			linuxdvb_err("cannot found writer for encoding %s using default\n", Encoding);
@@ -272,6 +307,7 @@ int LinuxDvbPlay(Context_t *context, char *type)
 				ret = -1;
 			}
 		}
+
 		if (ioctl(audiofd, AUDIO_PLAY, NULL) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
@@ -280,6 +316,7 @@ int LinuxDvbPlay(Context_t *context, char *type)
 		}
 		free(Encoding);
 	}
+
 	return ret;
 }
 
@@ -288,8 +325,11 @@ int LinuxDvbStop(Context_t *context __attribute__((unused)), char *type)
 	int ret = cERR_LINUXDVB_NO_ERROR;
 	unsigned char video = !strcmp("video", type);
 	unsigned char audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, "v%d a%d\n", video, audio);
+
 	getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 	if (video && videofd != -1)
 	{
 		if (ioctl(videofd, VIDEO_CLEAR_BUFFER) == -1)
@@ -297,6 +337,7 @@ int LinuxDvbStop(Context_t *context __attribute__((unused)), char *type)
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("VIDEO_CLEAR_BUFFER: %s\n", strerror(errno));
 		}
+
 		/* set back to normal speed (end trickmodes) */
 		if (ioctl(videofd, VIDEO_SET_SPEED, DVB_SPEED_NORMAL_PLAY) == -1)
 		{
@@ -317,6 +358,7 @@ int LinuxDvbStop(Context_t *context __attribute__((unused)), char *type)
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("AUDIO_CLEAR_BUFFER: %s\n", strerror(errno));
 		}
+
 		/* set back to normal speed (end trickmodes) */
 		if (ioctl(audiofd, AUDIO_SET_SPEED, DVB_SPEED_NORMAL_PLAY) == -1)
 		{
@@ -330,7 +372,9 @@ int LinuxDvbStop(Context_t *context __attribute__((unused)), char *type)
 			ret = cERR_LINUXDVB_ERROR;
 		}
 	}
+
 	releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 	return ret;
 }
 
@@ -339,8 +383,11 @@ int LinuxDvbPause(Context_t *context __attribute__((unused)), char *type)
 	int ret = cERR_LINUXDVB_NO_ERROR;
 	unsigned char video = !strcmp("video", type);
 	unsigned char audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, "v%d a%d\n", video, audio);
+
 	getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 	if (video && videofd != -1)
 	{
 		if (ioctl(videofd, VIDEO_FREEZE, NULL) == -1)
@@ -359,7 +406,9 @@ int LinuxDvbPause(Context_t *context __attribute__((unused)), char *type)
 			ret = cERR_LINUXDVB_ERROR;
 		}
 	}
+
 	releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 	return ret;
 }
 
@@ -368,7 +417,9 @@ int LinuxDvbContinue(Context_t *context __attribute__((unused)), char *type)
 	int ret = cERR_LINUXDVB_NO_ERROR;
 	unsigned char video = !strcmp("video", type);
 	unsigned char audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, "v%d a%d\n", video, audio);
+
 	if (video && videofd != -1)
 	{
 		if (ioctl(videofd, VIDEO_CONTINUE, NULL) == -1)
@@ -387,7 +438,10 @@ int LinuxDvbContinue(Context_t *context __attribute__((unused)), char *type)
 			ret = cERR_LINUXDVB_ERROR;
 		}
 	}
+
 	linuxdvb_printf(10, "exiting\n");
+
+
 	return ret;
 }
 
@@ -395,20 +449,26 @@ int LinuxDvbReverseDiscontinuity(Context_t *context __attribute__((unused)), int
 {
 	int ret = cERR_LINUXDVB_NO_ERROR;
 	int dis_type = VIDEO_DISCONTINUITY_CONTINUOUS_REVERSE | *surplus;
+
 	linuxdvb_printf(50, "\n");
+
 	if (ioctl(videofd, VIDEO_DISCONTINUITY, (void *) dis_type) == -1)
 	{
 		linuxdvb_err("ioctl failed with errno %d\n", errno);
 		linuxdvb_err("VIDEO_DISCONTINUITY: %s\n", strerror(errno));
 	}
+
 	linuxdvb_printf(50, "exiting\n");
+
 	return ret;
 }
 
 int LinuxDvbAudioMute(Context_t *context __attribute__((unused)), char *flag)
 {
 	int ret = cERR_LINUXDVB_NO_ERROR;
+
 	linuxdvb_printf(10, "\n");
+
 	if (audiofd != -1)
 	{
 		if (*flag == '1')
@@ -436,18 +496,24 @@ int LinuxDvbAudioMute(Context_t *context __attribute__((unused)), char *flag)
 			}
 		}
 	}
+
 	linuxdvb_printf(10, "exiting\n");
+
 	return ret;
 }
 
+
 int LinuxDvbFlush(Context_t *context __attribute__((unused)), char *type)
 {
 	unsigned char video = !strcmp("video", type);
 	unsigned char audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, "v%d a%d\n", video, audio);
+
 	if ((video && videofd != -1) || (audio && audiofd != -1))
 	{
 		getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 		if (video && videofd != -1)
 		{
 			if (ioctl(videofd, VIDEO_FLUSH, NULL) == -1)
@@ -456,6 +522,7 @@ int LinuxDvbFlush(Context_t *context __attribute__((unused)), char *type)
 				linuxdvb_err("VIDEO_FLUSH: %s\n", strerror(errno));
 			}
 		}
+
 		if (audio && audiofd != -1)
 		{
 			if (ioctl(audiofd, AUDIO_FLUSH, NULL) == -1)
@@ -464,9 +531,12 @@ int LinuxDvbFlush(Context_t *context __attribute__((unused)), char *type)
 				linuxdvb_err("AUDIO_FLUSH: %s\n", strerror(errno));
 			}
 		}
+
 		releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
 	}
+
 	linuxdvb_printf(10, "exiting\n");
+
 	return cERR_LINUXDVB_NO_ERROR;
 }
 
@@ -474,22 +544,31 @@ int LinuxDvbFlush(Context_t *context __attribute__((unused)), char *type)
 int LinuxDvbFastForward(Context_t *context, char *type)
 {
 	int ret = cERR_LINUXDVB_NO_ERROR;
+
 	unsigned char video = !strcmp("video", type);
 	unsigned char audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, "v%d a%d speed %d\n", video, audio, context->playback->Speed);
+
 	if (video && videofd != -1)
 	{
+
 		getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 		/* konfetti comment: speed is a value given in skipped frames */
+
 		if (ioctl(videofd, VIDEO_FAST_FORWARD, context->playback->Speed) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("VIDEO_FAST_FORWARD: %s\n", strerror(errno));
 			ret = cERR_LINUXDVB_ERROR;
 		}
+
 		releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
 	}
+
 	linuxdvb_printf(10, "exiting with value %d\n", ret);
+
 	return ret;
 }
 #else
@@ -508,38 +587,54 @@ int LinuxDvbFastForward(Context_t *context, char *type)
 	int speedIndex;
 	unsigned char video = !strcmp("video", type);
 	unsigned char audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, "v%d a%d\n", video, audio);
+
 	if (video && videofd != -1)
 	{
+
 		getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 		speedIndex = context->playback->Speed % (sizeof(SpeedList) / sizeof(int));
+
 		linuxdvb_printf(1, "speedIndex %d\n", speedIndex);
+
 		if (ioctl(videofd, VIDEO_SET_SPEED, SpeedList[speedIndex]) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("VIDEO_SET_SPEED: %s\n", strerror(errno));
 			ret = cERR_LINUXDVB_ERROR;
 		}
+
 		releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
 	}
+
 	if (audio && audiofd != -1)
 	{
+
 		getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 		speedIndex = context->playback->Speed % (sizeof(SpeedList) / sizeof(int));
+
 		linuxdvb_printf(1, "speedIndex %d\n", speedIndex);
+
 		if (ioctl(audiofd, AUDIO_SET_SPEED, SpeedList[speedIndex]) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("AUDIO_SET_SPEED: %s\n", strerror(errno));
 			ret = cERR_LINUXDVB_ERROR;
 		}
+
 		releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
 	}
+
 	linuxdvb_printf(10, "exiting with value %d\n", ret);
+
 	return ret;
 }
 #endif
 
+
 int LinuxDvbReverse(Context_t *context __attribute__((unused)), char *type __attribute__((unused)))
 {
 	int ret = cERR_LINUXDVB_NO_ERROR;
@@ -549,12 +644,16 @@ int LinuxDvbReverse(Context_t *context __attribute__((unused)), char *type __att
 int LinuxDvbSlowMotion(Context_t *context, char *type)
 {
 	int ret = cERR_LINUXDVB_NO_ERROR;
+
 	unsigned char video = !strcmp("video", type);
 	unsigned char audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, "v%d a%d\n", video, audio);
+
 	if ((video && videofd != -1) || (audio && audiofd != -1))
 	{
 		getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 		if (video && videofd != -1)
 		{
 			if (ioctl(videofd, VIDEO_SLOWMOTION, context->playback->SlowMotion) == -1)
@@ -564,9 +663,12 @@ int LinuxDvbSlowMotion(Context_t *context, char *type)
 				ret = cERR_LINUXDVB_ERROR;
 			}
 		}
+
 		releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
 	}
+
 	linuxdvb_printf(10, "exiting with value %d\n", ret);
+
 	return ret;
 }
 
@@ -582,14 +684,17 @@ int LinuxDvbAVSync(Context_t *context, char *type __attribute__((unused)))
 	if (audiofd != -1)
 	{
 		getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 		if (ioctl(audiofd, AUDIO_SET_AV_SYNC, context->playback->AVSync) == -1)
 		{
 			linuxdvb_err("ioctl failed with errno %d\n", errno);
 			linuxdvb_err("AUDIO_SET_AV_SYNC: %s\n", strerror(errno));
 			ret = cERR_LINUXDVB_ERROR;
 		}
+
 		releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
 	}
+
 	return ret;
 }
 
@@ -598,10 +703,13 @@ int LinuxDvbClear(Context_t *context __attribute__((unused)), char *type)
 	int32_t ret = cERR_LINUXDVB_NO_ERROR;
 	uint8_t video = !strcmp("video", type);
 	uint8_t audio = !strcmp("audio", type);
+
 	linuxdvb_printf(10, ">>>>>>>>>>LinuxDvbClear v%d a%d\n", video, audio);
+
 	if ((video && videofd != -1) || (audio && audiofd != -1))
 	{
 		getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 		if (video && videofd != -1)
 		{
 			if (ioctl(videofd, VIDEO_CLEAR_BUFFER) == -1)
@@ -620,18 +728,24 @@ int LinuxDvbClear(Context_t *context __attribute__((unused)), char *type)
 				ret = cERR_LINUXDVB_ERROR;
 			}
 		}
+
 		releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
 	}
+
 	linuxdvb_printf(10, "exiting\n");
+
 	return ret;
 }
 
 int LinuxDvbPts(Context_t *context __attribute__((unused)), unsigned long long int *pts)
 {
 	int ret = cERR_LINUXDVB_ERROR;
+
 	linuxdvb_printf(50, "\n");
+
 	// pts is a non writting requests and can be done in parallel to other requests
 	//getLinuxDVBMutex(FILENAME, __FUNCTION__,__LINE__);
+
 	if (videofd > -1 && !ioctl(videofd, VIDEO_GET_PTS, (void *)&sCURRENT_PTS))
 	{
 		ret = cERR_LINUXDVB_NO_ERROR;
@@ -640,6 +754,7 @@ int LinuxDvbPts(Context_t *context __attribute__((unused)), unsigned long long i
 	{
 		linuxdvb_err("VIDEO_GET_PTS: %d (%s)\n", errno, strerror(errno));
 	}
+
 	if (ret != cERR_LINUXDVB_NO_ERROR)
 	{
 		if (audiofd > -1 && !ioctl(audiofd, AUDIO_GET_PTS, (void *)&sCURRENT_PTS))
@@ -651,12 +766,16 @@ int LinuxDvbPts(Context_t *context __attribute__((unused)), unsigned long long i
 			linuxdvb_err("AUDIO_GET_PTS: %d (%s)\n", errno, strerror(errno));
 		}
 	}
+
 	if (ret != cERR_LINUXDVB_NO_ERROR)
 	{
 		sCURRENT_PTS = 0;
 	}
+
 	*((unsigned long long int *)pts) = (unsigned long long int)sCURRENT_PTS;
+
 	//releaseLinuxDVBMutex(FILENAME, __FUNCTION__,__LINE__);
+
 	return ret;
 }
 
@@ -664,8 +783,11 @@ int LinuxDvbGetFrameCount(Context_t *context __attribute__((unused)), unsigned l
 {
 	int ret = cERR_LINUXDVB_NO_ERROR;
 	dvb_play_info_t playInfo;
+
 	linuxdvb_printf(50, "\n");
+
 	getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 	if (videofd != -1)
 	{
 		if (ioctl(videofd, VIDEO_GET_PLAY_INFO, (void *)&playInfo) == -1)
@@ -690,9 +812,12 @@ int LinuxDvbGetFrameCount(Context_t *context __attribute__((unused)), unsigned l
 	{
 		ret = cERR_LINUXDVB_ERROR;
 	}
+
 	if (ret == cERR_LINUXDVB_NO_ERROR)
 		*((unsigned long long int *)frameCount) = playInfo.frame_count;
+
 	releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 	return ret;
 }
 
@@ -701,28 +826,38 @@ int LinuxDvbSwitch(Context_t *context, char *type)
 	unsigned char audio = !strcmp("audio", type);
 	unsigned char video = !strcmp("video", type);
 	Writer_t *writer;
+
 	linuxdvb_printf(10, "v%d a%d\n", video, audio);
+
 	if ((video && videofd != -1) || (audio && audiofd != -1))
 	{
 		getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 		if (audio && audiofd != -1)
 		{
 			char *Encoding = NULL;
 			if (context && context->manager && context->manager->audio)
 			{
 				context->manager->audio->Command(context, MANAGER_GETENCODING, &Encoding);
+
 				linuxdvb_printf(10, "A %s\n", Encoding);
+
 				writer = getWriter(Encoding);
+
 				if (ioctl(audiofd, AUDIO_STOP, NULL) == -1)
 				{
 					linuxdvb_err("ioctl failed with errno %d\n", errno);
 					linuxdvb_err("AUDIO_STOP: %s\n", strerror(errno));
+
 				}
+
 				if (ioctl(audiofd, AUDIO_CLEAR_BUFFER) == -1)
 				{
 					linuxdvb_err("ioctl failed with errno %d\n", errno);
 					linuxdvb_err("AUDIO_CLEAR_BUFFER: %s\n", strerror(errno));
+
 				}
+
 				if (writer == NULL)
 				{
 					linuxdvb_err("cannot found writer for encoding %s using default\n", Encoding);
@@ -741,6 +876,7 @@ int LinuxDvbSwitch(Context_t *context, char *type)
 						linuxdvb_err("AUDIO_SET_ENCODING: %s\n", strerror(errno));
 					}
 				}
+
 				if (ioctl(audiofd, AUDIO_PLAY, NULL) == -1)
 				{
 					linuxdvb_err("ioctl failed with errno %d\n", errno);
@@ -753,24 +889,30 @@ int LinuxDvbSwitch(Context_t *context, char *type)
 				linuxdvb_printf(20, "no context for Audio\n");
 			}
 		}
+
 		if (video && videofd != -1)
 		{
 			char *Encoding = NULL;
 			if (context && context->manager && context->manager->video)
 			{
 				context->manager->video->Command(context, MANAGER_GETENCODING, &Encoding);
+
 				if (ioctl(videofd, VIDEO_STOP, NULL) == -1)
 				{
 					linuxdvb_err("ioctl failed with errno %d\n", errno);
 					linuxdvb_err("VIDEO_STOP: %s\n", strerror(errno));
 				}
+
 				if (ioctl(videofd, VIDEO_CLEAR_BUFFER) == -1)
 				{
 					linuxdvb_err("ioctl failed with errno %d\n", errno);
 					linuxdvb_err("VIDEO_CLEAR_BUFFER: %s\n", strerror(errno));
 				}
+
 				linuxdvb_printf(10, "V %s\n", Encoding);
+
 				writer = getWriter(Encoding);
+
 				if (writer == NULL)
 				{
 					linuxdvb_err("cannot found writer for encoding %s using default\n", Encoding);
@@ -789,6 +931,7 @@ int LinuxDvbSwitch(Context_t *context, char *type)
 						linuxdvb_err("VIDEO_SET_ENCODING: %s\n", strerror(errno));
 					}
 				}
+
 				if (ioctl(videofd, VIDEO_PLAY, NULL) == -1)
 				{
 					/* konfetti: fixme: think on this, I think we should
@@ -804,9 +947,13 @@ int LinuxDvbSwitch(Context_t *context, char *type)
 				linuxdvb_printf(20, "no context for Video\n");
 			}
 		}
+
 		releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
+
 	}
+
 	linuxdvb_printf(10, "exiting\n");
+
 	return cERR_LINUXDVB_NO_ERROR;
 }
 
@@ -820,27 +967,35 @@ static int Write(void *_context, void *_out)
 	unsigned char      audio     = 0;
 	Writer_t          *writer;
 	WriterAVCallData_t call;
+
 	if (out == NULL)
 	{
 		linuxdvb_err("null pointer passed\n");
 		return cERR_LINUXDVB_ERROR;
 	}
+
 	video = !strcmp("video", out->type);
 	audio = !strcmp("audio", out->type);
+
 	linuxdvb_printf(20, "DataLength=%u PrivateLength=%u Pts=%llu FrameRate=%f\n",
 	                out->len, out->extralen, out->pts, out->frameRate);
 	linuxdvb_printf(20, "v%d a%d\n", video, audio);
+
 	if (video)
 	{
 		char *Encoding = NULL;
 		context->manager->video->Command(context, MANAGER_GETENCODING, &Encoding);
+
 		linuxdvb_printf(20, "Encoding = %s\n", Encoding);
+
 		writer = getWriter(Encoding);
+
 		if (writer == NULL)
 		{
 			linuxdvb_printf(20, "searching default writer ... %s\n", Encoding);
 			writer = getDefaultVideoWriter();
 		}
+
 		if (writer == NULL)
 		{
 			linuxdvb_err("unknown video codec and no default writer %s\n", Encoding);
@@ -891,6 +1046,7 @@ static int Write(void *_context, void *_out)
 					}
 				}
 			}
+
 			call.fd           = videofd;
 			call.data         = out->data;
 			call.len          = out->len;
@@ -904,10 +1060,12 @@ static int Write(void *_context, void *_out)
 			call.Height       = out->height;
 			call.InfoFlags    = out->infoFlags;
 			call.Version      = 0; // is unsingned char
+
 			if (writer->writeData)
 			{
 				res = writer->writeData(&call);
 			}
+
 			if (res < 0)
 			{
 				linuxdvb_err("failed to write data %d - %d\n", res, errno);
@@ -915,19 +1073,24 @@ static int Write(void *_context, void *_out)
 				ret = cERR_LINUXDVB_ERROR;
 			}
 		}
+
 		free(Encoding);
 	}
 	else if (audio)
 	{
 		char *Encoding = NULL;
 		context->manager->audio->Command(context, MANAGER_GETENCODING, &Encoding);
+
 		linuxdvb_printf(20, "%s::%s Encoding = %s\n", FILENAME, __FUNCTION__, Encoding);
+
 		writer = getWriter(Encoding);
+
 		if (writer == NULL)
 		{
 			linuxdvb_printf(20, "searching default writer ... %s\n", Encoding);
 			writer = getDefaultAudioWriter();
 		}
+
 		if (writer == NULL)
 		{
 			linuxdvb_err("unknown audio codec %s and no default writer\n", Encoding);
@@ -946,10 +1109,12 @@ static int Write(void *_context, void *_out)
 			call.FrameScale     = out->timeScale;
 			call.InfoFlags      = out->infoFlags;
 			call.Version        = 0; /* -1; unsigned char cannot be negative */
+
 			if (writer->writeData)
 			{
 				res = writer->writeData(&call);
 			}
+
 			if (res < 0)
 			{
 				linuxdvb_err("failed to write data %d - %d\n", res, errno);
@@ -957,8 +1122,10 @@ static int Write(void *_context, void *_out)
 				ret = cERR_LINUXDVB_ERROR;
 			}
 		}
+
 		free(Encoding);
 	}
+
 	return ret;
 }
 
@@ -967,8 +1134,11 @@ static int reset(Context_t *context)
 	int ret = cERR_LINUXDVB_NO_ERROR;
 	Writer_t *writer;
 	char *Encoding = NULL;
+
 	context->manager->video->Command(context, MANAGER_GETENCODING, &Encoding);
+
 	writer = getWriter(Encoding);
+
 	if (writer == NULL)
 	{
 		linuxdvb_err("unknown video codec %s\n", Encoding);
@@ -978,9 +1148,13 @@ static int reset(Context_t *context)
 	{
 		writer->reset();
 	}
+
 	free(Encoding);
+
 	context->manager->audio->Command(context, MANAGER_GETENCODING, &Encoding);
+
 	writer = getWriter(Encoding);
+
 	if (writer == NULL)
 	{
 		linuxdvb_err("unknown video codec %s\n", Encoding);
@@ -990,7 +1164,9 @@ static int reset(Context_t *context)
 	{
 		writer->reset();
 	}
+
 	free(Encoding);
+
 	return ret;
 }
 
@@ -998,7 +1174,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
 {
 	Context_t *context = (Context_t *) _context;
 	int ret = cERR_LINUXDVB_NO_ERROR;
+
 	linuxdvb_printf(50, "Command %d\n", command);
+
 	switch (command)
 	{
 		case OUTPUT_OPEN:
@@ -1110,7 +1288,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
 			ret = cERR_LINUXDVB_ERROR;
 			break;
 	}
+
 	linuxdvb_printf(50, "exiting with value %d\n", ret);
+
 	return ret;
 }