fix compile warnings

This commit is contained in:
niels
2015-06-14 00:07:33 +02:00
parent 7f03bf9423
commit d3cc9c0c90
3 changed files with 2 additions and 14 deletions

View File

@@ -300,11 +300,10 @@ static __inline__ void * __memcpy(void * to, const void * from, size_t n)
#endif #endif
#undef _MMREG_SIZE #undef _MMREG_SIZE
#ifdef HAVE_ASM_MMX
#define _MMREG_SIZE 8
#endif
#ifdef HAVE_ASM_SSE #ifdef HAVE_ASM_SSE
#define _MMREG_SIZE 16 #define _MMREG_SIZE 16
#elif HAVE_ASM_MMX
#define _MMREG_SIZE 8
#endif #endif
#ifdef HAVE_ASM_AVX #ifdef HAVE_ASM_AVX
#define _MMREG_SIZE 32 #define _MMREG_SIZE 32

View File

@@ -439,7 +439,6 @@ int vj_font_load_srt( void *font, const char *filename )
vj_font_t *ff = (vj_font_t*) font; vj_font_t *ff = (vj_font_t*) font;
FILE *f = fopen( filename, "r" ); FILE *f = fopen( filename, "r" );
unsigned int len = 0; unsigned int len = 0;
unsigned int i;
if(!f) if(!f)
{ {
veejay_msg(VEEJAY_MSG_ERROR, "Unable to load SRT file '%s'",filename ); veejay_msg(VEEJAY_MSG_ERROR, "Unable to load SRT file '%s'",filename );
@@ -754,10 +753,6 @@ char *vj_font_get_sequence( void *font, int seq )
tcl1 = strlen(tc1); tcl1 = strlen(tc1);
tcl2 = strlen(tc2); tcl2 = strlen(tc2);
uint8_t bg[3];
uint8_t fg[3];
snprintf( tmp,sizeof(tmp), "%05d%09d%09d%02d%s%02d%s%03d%s%04d%04d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d", snprintf( tmp,sizeof(tmp), "%05d%09d%09d%02d%s%02d%s%03d%s%04d%04d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d%03d",
s->id, s->id,
(int)s->start, (int)s->start,
@@ -1002,7 +997,6 @@ static int is_ttf( const char *file )
static int try_deepen( vj_font_t *f , char *path ) static int try_deepen( vj_font_t *f , char *path )
{ {
int n = 0;
if(!path) return 0; if(!path) return 0;
struct stat l; struct stat l;
@@ -2197,7 +2191,6 @@ static void vj_font_text_osd_render(vj_font_t *f, void *_picture, int x, int y )
// if( str_w_max == 0 ) // if( str_w_max == 0 )
str_w_max = (x - x1); str_w_max = (x - x1);
int bw = str_w_max;
int bh = y - y1; int bh = y - y1;
if(bh <= 0 ) if(bh <= 0 )
bh = y1 + f->current_size + 4; bh = y1 + f->current_size + 4;

View File

@@ -25,7 +25,6 @@ static int driver = 0;
static int bits_per_sample = 0; static int bits_per_sample = 0;
static unsigned long audio_rate = 0; static unsigned long audio_rate = 0;
static int audio_channels = 0; static int audio_channels = 0;
static unsigned long v_rate = 0;
extern void veejay_msg(int type, const char format[], ...); extern void veejay_msg(int type, const char format[], ...);
int vj_jack_initialize() int vj_jack_initialize()
@@ -75,9 +74,6 @@ static int _vj_jack_start(int *dri)
int vj_jack_init(editlist *el) int vj_jack_init(editlist *el)
{ {
int err;
int v_rate = el->audio_rate;
int i = 0;
int ret = 0; int ret = 0;
// JACK_Init(); // JACK_Init();