Commit 9ce57311 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Misc fixes in goom, freetype and warning in last.fm

parent 34df8097
...@@ -465,6 +465,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -465,6 +465,8 @@ static void Run( intf_thread_t *p_intf )
static int PlayingChange( vlc_object_t *p_this, const char *psz_var, static int PlayingChange( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data ) vlc_value_t oldval, vlc_value_t newval, void *p_data )
{ {
VLC_UNUSED( oldval );
intf_thread_t *p_intf = ( intf_thread_t* ) p_data; intf_thread_t *p_intf = ( intf_thread_t* ) p_data;
intf_sys_t *p_sys = p_intf->p_sys; intf_sys_t *p_sys = p_intf->p_sys;
input_thread_t *p_input = ( input_thread_t* )p_this; input_thread_t *p_input = ( input_thread_t* )p_this;
......
...@@ -49,7 +49,9 @@ ...@@ -49,7 +49,9 @@
#include FT_GLYPH_H #include FT_GLYPH_H
#define FT_FLOOR(X) ((X & -64) >> 6) #define FT_FLOOR(X) ((X & -64) >> 6)
#define FT_CEIL(X) (((X + 63) & -64) >> 6) #define FT_CEIL(X) (((X + 63) & -64) >> 6)
#define FT_MulFix(v, s) (((v)*(s))>>16) #ifndef FT_MulFix
#define FT_MulFix(v, s) (((v)*(s))>>16)
#endif
#ifdef __APPLE__ #ifdef __APPLE__
#define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont" #define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont"
......
...@@ -102,7 +102,7 @@ typedef struct ...@@ -102,7 +102,7 @@ typedef struct
vlc_cond_t wait; vlc_cond_t wait;
/* Audio properties */ /* Audio properties */
int i_channels; unsigned i_channels;
/* Audio samples queue */ /* Audio samples queue */
block_t *pp_blocks[MAX_BLOCKS]; block_t *pp_blocks[MAX_BLOCKS];
...@@ -274,8 +274,8 @@ static int FillBuffer( int16_t *p_data, int *pi_data, ...@@ -274,8 +274,8 @@ static int FillBuffer( int16_t *p_data, int *pi_data,
if( !p_this->i_blocks ) return VLC_EGENERIC; if( !p_this->i_blocks ) return VLC_EGENERIC;
p_block = p_this->pp_blocks[0]; p_block = p_this->pp_blocks[0];
i_samples = __MIN( 512 - *pi_data, p_block->i_buffer / i_samples = __MIN( (unsigned)(512 - *pi_data),
sizeof(float) / p_this->i_channels ); p_block->i_buffer / sizeof(float) / p_this->i_channels );
/* Date management */ /* Date management */
if( p_block->i_pts > 0 && if( p_block->i_pts > 0 &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment