- formatting code using astyle

Conflicts:
	libarmbox/dmx.cpp
	libgeneric-pc/video_lib.h
	libspark/dmx.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-05-17 23:47:39 +02:00
committed by Thilo Graf
parent 42264ba4af
commit 7e5b1fc5d2
161 changed files with 13043 additions and 11396 deletions

View File

@@ -195,7 +195,7 @@ static int PlaybackOpen(Context_t *context, PlayFiles_t *pFiles)
// mms is in reality called rtsp, and ffmpeg expects this
int len = strlen(uri) + 2;
char *tUri = (char *)malloc(strlen(uri) + 2);
snprintf(tUri,len,"rtsp%s",uri+3);
snprintf(tUri, len, "rtsp%s", uri + 3);
free(context->playback->uri);
context->playback->uri = tUri;
}
@@ -219,7 +219,7 @@ static int PlaybackOpen(Context_t *context, PlayFiles_t *pFiles)
(context->container->selectedContainer->Command(context, CONTAINER_INIT, pFiles) < 0))
{
playback_err("CONTAINER_ADD failed\n");
if(context->playback->uri)
if (context->playback->uri)
{
free(context->playback->uri);
context->playback->uri = NULL;
@@ -242,9 +242,9 @@ static int PlaybackClose(Context_t *context)
{
playback_err("container delete failed\n");
}
if(context->manager->audio)
if (context->manager->audio)
context->manager->audio->Command(context, MANAGER_DEL, NULL);
if(context->manager->video)
if (context->manager->video)
context->manager->video->Command(context, MANAGER_DEL, NULL);
if (context->manager->chapter)
context->manager->chapter->Command(context, MANAGER_DEL, NULL);
@@ -385,8 +385,8 @@ static int32_t PlaybackContinue(Context_t *context)
playback_printf(10, "\n");
if (context->playback->isPlaying &&
(context->playback->isPaused || context->playback->isForwarding ||
context->playback->BackWard || context->playback->SlowMotion))
(context->playback->isPaused || context->playback->isForwarding ||
context->playback->BackWard || context->playback->SlowMotion))
{
if (context->playback->SlowMotion || context->playback->isForwarding || context->playback->BackWard)
context->output->Command(context, OUTPUT_CLEAR, NULL);
@@ -478,7 +478,7 @@ static int32_t PlaybackTerminate(Context_t *context)
}
ret = context->container->selectedContainer->Command(context, CONTAINER_STOP, NULL);
if(context && context->playback)
if (context && context->playback)
{
context->playback->isPaused = 0;
context->playback->isPlaying = 0;
@@ -487,7 +487,7 @@ static int32_t PlaybackTerminate(Context_t *context)
context->playback->SlowMotion = 0;
context->playback->Speed = 0;
}
if(context && context->output)
if (context && context->output)
context->output->Command(context, OUTPUT_STOP, NULL);
}
else
@@ -557,7 +557,7 @@ static int PlaybackFastBackward(Context_t *context, int *speed)
/* Audio only reverse play not supported */
if (context->playback->isVideo && !context->playback->isForwarding &&
(!context->playback->isPaused || context->playback->isPlaying))
(!context->playback->isPaused || context->playback->isPlaying))
{
if ((*speed > 0) || (*speed < cMaxSpeed_fr))
{