/*****************************************************************************
* vout_intf.c : video output interface
*****************************************************************************
- * Copyright (C) 2000-2006 the VideoLAN team
+ * Copyright (C) 2000-2007 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
#include <sys/types.h> /* opendir() */
#include <dirent.h> /* opendir() */
-#include <vlc/intf.h>
+#include <vlc_interface.h>
#include <vlc_block.h>
+#include <vlc_playlist.h>
-#include "vlc_video.h"
-#include "video_output.h"
-#include "vlc_image.h"
-#include "vlc_spu.h"
+#include <vlc_vout.h>
+#include <vlc_image.h>
+#include <vlc_osd.h>
+#include <vlc_charset.h>
-#include <snapshot.h>
+#include <vlc_strings.h>
+#include <vlc_charset.h>
+#include "../libvlc.h"
/*****************************************************************************
* Local prototypes
vlc_value_t, vlc_value_t, void * );
static int SnapshotCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static int TitleCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
/*****************************************************************************
* vout_RequestWindow: Create/Get a video window if possible.
var_Create( p_vout, "video-x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "video-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "video-title-show", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "video-title-timeout", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "video-title-position", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
+ p_vout->b_title_show = var_GetBool( p_vout, "video-title-show" );
+ p_vout->i_title_timeout = (mtime_t) var_GetInteger( p_vout, "video-title-timeout" );
+ p_vout->i_title_position = var_GetInteger( p_vout, "video-title-position" );
+
+ var_AddCallback( p_vout, "video-title-show", TitleCallback, NULL );
+ var_AddCallback( p_vout, "video-title-timeout", TitleCallback, NULL );
+ var_AddCallback( p_vout, "video-title-position", TitleCallback, NULL );
+
/* Zoom object var */
var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND |
VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "16:10"; text.psz_string = "16:10";
var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "221:100"; text.psz_string = "221:100";
- var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "5:4"; text.psz_string = "5:4";
var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "5:3"; text.psz_string = "5:3";
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "1.85:1"; text.psz_string = "1.85:1";
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "221:100"; text.psz_string = "2.21:1";
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "235:100"; text.psz_string = "2.35:1";
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "239:100"; text.psz_string = "2.39:1";
+ var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
/* Add custom crop ratios */
psz_buf = config_GetPsz( p_vout, "custom-crop-ratios" );
var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "16:10"; text.psz_string = "16:10";
var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "221:100"; text.psz_string = "221:100";
+ val.psz_string = "221:100"; text.psz_string = "2.21:1";
var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "5:4"; text.psz_string = "5:4";
var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
{
image_handler_t *p_image = image_HandlerCreate( p_vout );
- video_format_t fmt_in = {0}, fmt_out = {0};
+ video_format_t fmt_in, fmt_out;
char *psz_filename = NULL;
subpicture_t *p_subpic;
picture_t *p_pif;
vlc_value_t val, format;
DIR *path;
-
int i_ret;
+ memset( &fmt_in, 0, sizeof(video_format_t));
+ memset( &fmt_out, 0, sizeof(video_format_t));
+
var_Get( p_vout, "snapshot-path", &val );
if( val.psz_string && !*val.psz_string )
{
msg_Err( p_vout, "Could not get snapshot" );
image_HandlerDelete( p_image );
vlc_cond_signal( &p_dest->object_wait );
- vlc_mutex_unlock( &p_dest->object_lock );
vlc_object_release( p_dest );
return VLC_EGENERIC;
}
block_Release( p_block );
image_HandlerDelete( p_image );
vlc_cond_signal( &p_dest->object_wait );
- vlc_mutex_unlock( &p_dest->object_lock );
vlc_object_release( p_dest );
return VLC_ENOMEM;
}
free( p_snapshot );
image_HandlerDelete( p_image );
vlc_cond_signal( &p_dest->object_wait );
- vlc_mutex_unlock( &p_dest->object_lock );
vlc_object_release( p_dest );
return VLC_ENOMEM;
}
/* Unlock the object */
vlc_cond_signal( &p_dest->object_wait );
- vlc_mutex_unlock( &p_dest->object_lock );
vlc_object_release( p_dest );
image_HandlerDelete( p_image );
#if defined(__APPLE__) || defined(SYS_BEOS)
if( !val.psz_string && p_vout->p_libvlc->psz_homedir )
{
- asprintf( &val.psz_string, "%s/Desktop",
- p_vout->p_libvlc->psz_homedir );
+ if( asprintf( &val.psz_string, "%s/Desktop",
+ p_vout->p_libvlc->psz_homedir ) == -1 )
+ val.psz_string = NULL;
}
#elif defined(WIN32) && !defined(UNDER_CE)
char *p_mypicturesdir = NULL;
typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
- LPSTR );
+ LPWSTR );
#ifndef CSIDL_FLAG_CREATE
# define CSIDL_FLAG_CREATE 0x8000
#endif
/* load the shfolder dll to retrieve SHGetFolderPath */
if( ( shfolder_dll = LoadLibrary( _T("SHFolder.dll") ) ) != NULL )
{
- SHGetFolderPath = (void *)GetProcAddress( shfolder_dll,
- _T("SHGetFolderPathA") );
- if( SHGetFolderPath != NULL )
- {
- p_mypicturesdir = (char *)malloc( MAX_PATH );
- if( p_mypicturesdir )
- {
-
- if( S_OK != SHGetFolderPath( NULL,
- CSIDL_MYPICTURES | CSIDL_FLAG_CREATE,
- NULL, SHGFP_TYPE_CURRENT,
- p_mypicturesdir ) )
- {
- free( p_mypicturesdir );
- p_mypicturesdir = NULL;
- }
- }
- }
+ wchar_t wdir[PATH_MAX];
+ SHGetFolderPath = (void *)GetProcAddress( shfolder_dll,
+ _T("SHGetFolderPathW") );
+ if ((SHGetFolderPath != NULL )
+ && SUCCEEDED (SHGetFolderPath (NULL,
+ CSIDL_MYPICTURES | CSIDL_FLAG_CREATE,
+ NULL, SHGFP_TYPE_CURRENT,
+ wdir)))
+ p_mypicturesdir = FromWide (wdir);
+
FreeLibrary( shfolder_dll );
}
if( p_mypicturesdir == NULL )
{
- asprintf( &val.psz_string, "%s/" CONFIG_DIR,
- p_vout->p_libvlc->psz_homedir );
+ if( asprintf( &val.psz_string, "%s\\" CONFIG_DIR,
+ p_vout->p_libvlc->psz_homedir ) == -1 )
+ val.psz_string = NULL;
}
else
{
- asprintf( &val.psz_string, p_mypicturesdir );
+ if( asprintf( &val.psz_string, p_mypicturesdir ) == -1 )
+ val.psz_string = NULL;
free( p_mypicturesdir );
}
}
#else
if( !val.psz_string && p_vout->p_libvlc->psz_homedir )
{
- asprintf( &val.psz_string, "%s/" CONFIG_DIR,
- p_vout->p_libvlc->psz_homedir );
+ if( asprintf( &val.psz_string, "%s/" CONFIG_DIR,
+ p_vout->p_libvlc->psz_homedir ) == -1 )
+ val.psz_string = NULL;
}
#endif
/*
* Did the user specify a directory? If not, path = NULL.
*/
- path = opendir ( (const char *)val.psz_string );
+ path = utf8_opendir ( (const char *)val.psz_string );
if ( path != NULL )
{
char *psz_prefix = var_GetString( p_vout, "snapshot-prefix" );
if( !psz_prefix ) psz_prefix = strdup( "vlcsnap-" );
+ else
+ {
+ char *psz_tmp = str_format( p_vout, psz_prefix );
+ filename_sanitize( psz_tmp );
+ free( psz_prefix );
+ psz_prefix = psz_tmp;
+ }
closedir( path );
if( var_GetBool( p_vout, "snapshot-sequential" ) == VLC_TRUE )
FILE *p_file;
do
{
- asprintf( &psz_filename, "%s/%s%05d.%s", val.psz_string,
+ asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s", val.psz_string,
psz_prefix, i_num++, format.psz_string );
}
- while( ( p_file = fopen( psz_filename, "r" ) ) && !fclose( p_file ) );
+ while( ( p_file = utf8_fopen( psz_filename, "r" ) ) && !fclose( p_file ) );
var_SetInteger( p_vout, "snapshot-num", i_num );
}
else
{
- asprintf( &psz_filename, "%s/%s%u.%s", val.psz_string,
+ asprintf( &psz_filename, "%s" DIR_SEP "%s%u.%s", val.psz_string,
psz_prefix,
(unsigned int)(p_pic->date / 100000) & 0xFFFFFF,
format.psz_string );
}
else // The user specified a full path name (including file name)
{
- asprintf ( &psz_filename, "%s", val.psz_string );
+ psz_filename = str_format( p_vout, val.psz_string );
+ path_sanitize( psz_filename );
}
free( val.psz_string );
*****************************************************************************/
int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args )
{
+ (void)args;
switch( i_query )
{
case VOUT_REPARENT:
goto initwsize_end;
}
- if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
+ if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 ) {
+ msg_Warn( p_vout, "fucked up aspect" );
+ *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom / FP_FACTOR );
+ *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom /FP_FACTOR);
+ }
+ else if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
{
*pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
p_vout->fmt_in.i_sar_num / p_vout->fmt_in.i_sar_den / FP_FACTOR );
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
InitWindowSize( p_vout, &p_vout->i_window_width,
&p_vout->i_window_height );
vout_Control( p_vout, VOUT_SET_SIZE, p_vout->i_window_width,
int64_t i_aspect_num, i_aspect_den;
unsigned int i_width, i_height;
+ (void)oldval; (void)p_data;
+
/* Restore defaults */
p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset;
p_vout->fmt_in.i_visible_width = p_vout->fmt_render.i_visible_width;
vlc_value_t val;
char *psz_end, *psz_parser = strchr( newval.psz_string, ':' );
+ (void)psz_cmd; (void)oldval; (void)p_data;
/* Restore defaults */
p_vout->fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num;
vout_thread_t *p_vout = (vout_thread_t *)p_this;
playlist_t *p_playlist = pl_Yield( p_this );
vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, newval.b_bool );
+ (void)psz_cmd; (void)oldval; (void)p_data;
/* Modify playlist as well because the vout might have to be restarted */
var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL );
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vlc_value_t val;
playlist_t *p_playlist = pl_Yield( p_this );
+ (void)psz_cmd; (void)oldval; (void)p_data;
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
var_Set( p_playlist, "fullscreen", newval );
pl_Release( p_playlist );
- /* Disable "always on top" in fullscreen mode */
- var_Get( p_vout, "video-on-top", &val );
- if( newval.b_bool && val.b_bool )
- {
- val.b_bool = VLC_FALSE;
- vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, val.b_bool );
- }
- else if( !newval.b_bool && val.b_bool )
- {
- vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, val.b_bool );
- }
-
val.b_bool = VLC_TRUE;
var_Set( p_vout, "intf-change", val );
return VLC_SUCCESS;
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vout_Control( p_vout, VOUT_SNAPSHOT );
+ (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
return VLC_SUCCESS;
}
+
+static int TitleCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+
+ if( !strncmp( psz_cmd, "video-title-show", 16 ) )
+ p_vout->b_title_show = newval.b_bool;
+ else if( !strncmp( psz_cmd, "video-title-timeout", 19 ) )
+ p_vout->i_title_timeout = (mtime_t) newval.i_int;
+ else if( !strncmp( psz_cmd, "video-title-position", 20 ) )
+ p_vout->i_title_position = newval.i_int;
+ return VLC_SUCCESS;
+}
+
projects / vlc / blobdiff