Commit d77533f0 authored by Filippo Carone's avatar Filippo Carone

Video resize function added in libvlc.

Typo fix in modules/stream_out/bridge.c
parent bb444b6f
...@@ -335,6 +335,17 @@ void libvlc_video_take_snapshot( libvlc_input_t *, char *, libvlc_exception_t * ...@@ -335,6 +335,17 @@ void libvlc_video_take_snapshot( libvlc_input_t *, char *, libvlc_exception_t *
int libvlc_video_destroy( libvlc_input_t *, libvlc_exception_t *); int libvlc_video_destroy( libvlc_input_t *, libvlc_exception_t *);
/**
* Resize the video output window
* \param p_instance libvlc instance
* \param width new width for video output window
* \param height new height for video output window
* \param p_exception an initialized exception
* \return the mute status (boolean)
*/
void libvlc_video_resize( libvlc_input_t *, int, int, libvlc_exception_t *);
/** /**
* Downcast to this general type as placeholder for a platform specific one, such as: * Downcast to this general type as placeholder for a platform specific one, such as:
* Drawable on X11, * Drawable on X11,
...@@ -343,8 +354,16 @@ int libvlc_video_destroy( libvlc_input_t *, libvlc_exception_t *); ...@@ -343,8 +354,16 @@ int libvlc_video_destroy( libvlc_input_t *, libvlc_exception_t *);
*/ */
typedef int libvlc_drawable_t; typedef int libvlc_drawable_t;
/**
* Get current mute status
* \param p_instance libvlc instance
* \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32)
* \param p_exception an initialized exception
* \return the mute status (boolean)
*/
int libvlc_video_reparent( libvlc_input_t *, libvlc_drawable_t, libvlc_exception_t * ); int libvlc_video_reparent( libvlc_input_t *, libvlc_drawable_t, libvlc_exception_t * );
/** @} */ /** @} */
/** /**
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#define DELAY_TEXT N_("Delay") #define DELAY_TEXT N_("Delay")
#define DELAY_LONGTEXT N_("Pictures coming from the picture video outputs " \ #define DELAY_LONGTEXT N_("Pictures coming from the picture video outputs " \
"will be delayed accord to thi value (in milliseconds, should be "\ "will be delayed according to this value (in milliseconds, should be "\
">= 100 ms). For high values, you will need to raise caching values." ) ">= 100 ms). For high values, you will need to raise caching values." )
#define ID_OFFSET_TEXT N_("ID Offset") #define ID_OFFSET_TEXT N_("ID Offset")
......
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
* video.c: libvlc new API video functions * video.c: libvlc new API video functions
***************************************************************************** *****************************************************************************
* Copyright (C) 2005 the VideoLAN team * Copyright (C) 2005 the VideoLAN team
*
* $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $ * $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $
* *
* Authors: Clment Stenac <zorglub@videolan.org> * Authors: Clment Stenac <zorglub@videolan.org>
* Filippo Carone <littlejohn@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -27,6 +29,10 @@ ...@@ -27,6 +29,10 @@
#include <vlc/vout.h> #include <vlc/vout.h>
#include <vlc/intf.h> #include <vlc/intf.h>
/*
* Remember to release the returned vout_thread_t since it is locked at
* the end of this function.
*/
static vout_thread_t *GetVout( libvlc_input_t *p_input, static vout_thread_t *GetVout( libvlc_input_t *p_input,
libvlc_exception_t *p_exception ) libvlc_exception_t *p_exception )
{ {
...@@ -215,10 +221,20 @@ int libvlc_video_reparent( libvlc_input_t *p_input, libvlc_drawable_t d, ...@@ -215,10 +221,20 @@ int libvlc_video_reparent( libvlc_input_t *p_input, libvlc_drawable_t d,
{ {
vout_thread_t *p_vout = GetVout( p_input, p_e ); vout_thread_t *p_vout = GetVout( p_input, p_e );
vout_Control( p_vout , VOUT_REPARENT, d); vout_Control( p_vout , VOUT_REPARENT, d);
vlc_object_release( p_vout );
return 0; return 0;
} }
void libvlc_video_resize( libvlc_input_t *p_input, int width, int height, libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_input, p_e );
vout_Control( p_vout, VOUT_SET_SIZE, width, height );
vlc_object_release( p_vout );
}
int libvlc_video_destroy( libvlc_input_t *p_input, int libvlc_video_destroy( libvlc_input_t *p_input,
libvlc_exception_t *p_e ) libvlc_exception_t *p_e )
{ {
......
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