X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_intf.c;h=9103b22a3c5335972670144efe16db4a2852f219;hb=59dec65d5fe153565ea8705767874a2d876d2103;hp=2385c4e512f1fc16cad0534bafa59f3d69293499;hpb=78e39f0d6ddac05f824b1beb6bfc712088b17fdc;p=vlc diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index 2385c4e512..9103b22a3c 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -264,7 +264,7 @@ static void AddCustomRatios( vout_thread_t *p_vout, const char *psz_var, void vout_IntfInit( vout_thread_t *p_vout ) { vlc_value_t val, text, old_val; - vlc_bool_t b_force_par = VLC_FALSE; + bool b_force_par = false; char *psz_buf; int i; @@ -351,7 +351,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) } /* update triggered every time the vout's crop parameters are changed */ - var_Create( p_vout, "crop-update", VLC_VAR_VOID ); + var_Create( p_vout, "crop-update", VLC_VAR_VOID ); /* Add custom crop ratios */ psz_buf = config_GetPsz( p_vout, "custom-crop-ratios" ); @@ -393,7 +393,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) msg_Dbg( p_vout, "overriding monitor pixel aspect-ratio: %i:%i", p_vout->i_par_num, p_vout->i_par_den ); - b_force_par = VLC_TRUE; + b_force_par = true; } free( val.psz_string ); @@ -463,7 +463,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER ); var_Create( p_vout, "intf-change", VLC_VAR_BOOL ); - var_SetBool( p_vout, "intf-change", VLC_TRUE ); + var_SetBool( p_vout, "intf-change", true ); } /***************************************************************************** @@ -576,15 +576,15 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) } #if defined(__APPLE__) || defined(SYS_BEOS) - if( !val.psz_string && p_vout->p_libvlc->psz_homedir ) + if( !val.psz_string ) { if( asprintf( &val.psz_string, "%s/Desktop", - p_vout->p_libvlc->psz_homedir ) == -1 ) + config_GetHomeDir() ) == -1 ) val.psz_string = NULL; } #elif defined(WIN32) && !defined(UNDER_CE) - if( !val.psz_string && p_vout->p_libvlc->psz_homedir ) + if( !val.psz_string ) { /* Get the My Pictures folder path */ @@ -622,8 +622,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) if( p_mypicturesdir == NULL ) { - if( asprintf( &val.psz_string, "%s", - p_vout->p_libvlc->psz_homedir ) == -1 ) + if( asprintf( &val.psz_string, "%s", config_GetHomeDir() ) == -1 ) val.psz_string = NULL; } else @@ -637,12 +636,13 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) #else /* XXX: This saves in the data directory. Shouldn't we try saving * to psz_homedir/Desktop or something nicer ? */ - if( !val.psz_string && p_vout->p_libvlc->psz_datadir ) + char *psz_datadir = config_GetUserDataDir(); + if( !val.psz_string && psz_datadir ) { - if( asprintf( &val.psz_string, "%s", - p_vout->p_libvlc->psz_datadir ) == -1 ) + if( asprintf( &val.psz_string, "%s", psz_datadir ) == -1 ) val.psz_string = NULL; } + free( psz_datadir ); #endif if( !val.psz_string ) @@ -675,7 +675,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) } closedir( path ); - if( var_GetBool( p_vout, "snapshot-sequential" ) == VLC_TRUE ) + if( var_GetBool( p_vout, "snapshot-sequential" ) == true ) { int i_num = var_GetInteger( p_vout, "snapshot-num" ); FILE *p_file; @@ -720,19 +720,23 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) fmt_out.i_width = var_GetInteger( p_vout, "snapshot-width" ); fmt_out.i_height = var_GetInteger( p_vout, "snapshot-height" ); + fmt_in = p_vout->fmt_in; + if( fmt_out.i_width == 0 && fmt_out.i_height > 0 ) { - float f = (float)p_vout->fmt_in.i_height / fmt_out.i_height; - fmt_out.i_width = p_vout->fmt_in.i_width / f; + fmt_out.i_width = (fmt_in.i_width * fmt_out.i_height) / fmt_in.i_height; } else if( fmt_out.i_height == 0 && fmt_out.i_width > 0 ) { - float f = (float)p_vout->fmt_in.i_width / fmt_out.i_width; - fmt_out.i_height = p_vout->fmt_in.i_height / f; + fmt_out.i_height = (fmt_in.i_height * fmt_out.i_width) / fmt_in.i_width; + } + else + { + fmt_out.i_width = fmt_in.i_width; + fmt_out.i_height = fmt_in.i_height; } /* Save the snapshot */ - fmt_in = p_vout->fmt_in; fmt_out.i_sar_num = fmt_out.i_sar_den = 1; i_ret = image_WriteUrl( p_image, p_pic, &fmt_in, &fmt_out, psz_filename ); if( i_ret != VLC_SUCCESS ) @@ -767,8 +771,8 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) p_subpic->i_channel = 0; p_subpic->i_start = mdate(); p_subpic->i_stop = mdate() + 4000000; - p_subpic->b_ephemer = VLC_TRUE; - p_subpic->b_fade = VLC_TRUE; + p_subpic->b_ephemer = true; + p_subpic->b_fade = true; p_subpic->i_original_picture_width = p_vout->render.i_width * 4; p_subpic->i_original_picture_height = p_vout->render.i_height * 4; @@ -792,7 +796,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) *****************************************************************************/ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name, - vlc_bool_t b_add, vlc_bool_t b_setconfig ) + bool b_add, bool b_setconfig ) { char *psz_parser; char *psz_string = config_GetPsz( p_vout, "vout-filter" ); @@ -863,7 +867,7 @@ int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args ) break; case VOUT_SNAPSHOT: - p_vout->b_snapshot = VLC_TRUE; + p_vout->b_snapshot = true; return VLC_SUCCESS; break; @@ -1197,7 +1201,7 @@ static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd, var_Set( p_playlist, "fullscreen", newval ); pl_Release( p_playlist ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_vout, "intf-change", val ); return VLC_SUCCESS; }