mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 15:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: cleanup

Browse Source
This commit is contained in:
martii
2013-08-02 12:44:51 +02:00
parent f7d530de36
commit 6f531ed8b0
6 changed files with 47 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libeplayer3/container/text_srt.c
View File

@@ -34,7 +34,6 @@
#include <errno.h>
#include <unistd.h>
#include <limits.h>
#include "common.h"
#include "misc.h"
#include "subtitle.h"
@@ -302,7 +301,7 @@ static int SrtGetSubtitle(Context_t *context, char * Filename) {
srt_printf(10, "folder: %s\n", FilenameFolder);
getExtension(copyFilename, &FilenameExtension);
FilenameExtension = getExtension(copyFilename);
if (FilenameExtension == NULL)
{
@@ -331,16 +330,13 @@ static int SrtGetSubtitle(Context_t *context, char * Filename) {
strcpy(subtitleFilename, (*dirzeiger).d_name);
// Extension of Relativ Subtitle File Name
getExtension(subtitleFilename, &subtitleExtension);
subtitleExtension = getExtension(subtitleFilename);
if (subtitleExtension == NULL)
continue;
if (strcmp(subtitleExtension, "srt") != 0)
{
free(subtitleExtension);
continue;
}
/* cut extension */
subtitleFilename[strlen(subtitleFilename) - strlen(subtitleExtension) - 1] = '\0';
@@ -371,13 +367,10 @@ static int SrtGetSubtitle(Context_t *context, char * Filename) {
Subtitle.Id = i++,
context->manager->subtitle->Command(context, MANAGER_ADD, &Subtitle);
}
free(subtitleExtension);
} /* while */
closedir(dir);
} /* if dir */
free(FilenameExtension);
free(copyFilename);
srt_printf(10, "<\n");
@@ -430,7 +423,6 @@ static int SrtCloseSubtitle(Context_t *context __attribute__((unused))) {
return cERR_SRT_NO_ERROR;
}
static int SrtSwitchSubtitle(Context_t *context, int* arg) {
int ret = cERR_SRT_NO_ERROR;
@@ -447,6 +439,7 @@ static int SrtSwitchSubtitle(Context_t *context, int* arg) {
hasThreadStarted = 1;
}
return ret;
}

17
libeplayer3/container/text_ssa.c
View File

@@ -68,11 +68,11 @@ if (debug_level >= level) printf("[%s:%s] " fmt, FILENAME, __FUNCTION__, ## x);
#define TRACKWRAP 20
#define MAXLINELENGTH 1000
static const char FILENAME[] = "text_ssa.c";
//Buffer size used in getLine function. Do not set to value less than 1 !!!
#define SSA_BUFFER_SIZE 14
static const char FILENAME[] = "text_ssa.c";
/* ***************************** */
/* Types */
/* ***************************** */
@@ -240,9 +240,11 @@ static char ** SsaManagerList(Context_t *context __attribute__((unused))) {
if (Tracks != NULL) {
char help[256];
int i = 0, j = 0;
tracklist = malloc(sizeof(char *) * ((TrackCount*2) + 1));
for (i = 0, j = 0; i < TrackCount; i++, j+=2) {
sprintf(help, "%d", Tracks[i].Id);
tracklist[j] = strdup(help);
tracklist[j+1] = strdup(Tracks[i].File);
@@ -303,7 +305,7 @@ static int SsaGetSubtitle(Context_t *context, char * Filename) {
ssa_printf(10, "folder: %s\n", FilenameFolder);
getExtension(copyFilename, &FilenameExtension);
FilenameExtension = getExtension(copyFilename);
if (FilenameExtension == NULL)
{
@@ -332,16 +334,13 @@ static int SsaGetSubtitle(Context_t *context, char * Filename) {
strcpy(subtitleFilename, (*dirzeiger).d_name);
// Extension of Relativ Subtitle File Name
getExtension(subtitleFilename, &subtitleExtension);
subtitleExtension = getExtension(subtitleFilename);
if (subtitleExtension == NULL)
continue;
if ( strcmp(subtitleExtension, "ssa") != 0 && strcmp(subtitleExtension, "ass") != 0 )
{
free(subtitleExtension);
continue;
}
/* cut extension */
subtitleFilename[strlen(subtitleFilename) - strlen(subtitleExtension) - 1] = '\0';
@@ -372,17 +371,13 @@ static int SsaGetSubtitle(Context_t *context, char * Filename) {
Subtitle.Id = i++;
context->manager->subtitle->Command(context, MANAGER_ADD, &Subtitle);
}
free(subtitleExtension);
} /* while */
closedir(dir);
} /* if dir */
free(FilenameExtension);
free(copyFilename);
ssa_printf(10, "<\n");
return cERR_SSA_NO_ERROR;
}