*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <mediacontrol_internal.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "mediacontrol_internal.h"
+#include "libvlc_internal.h"
#include <vlc/mediacontrol.h>
+#include <vlc/libvlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
-#include <vlc_demux.h>
-
+#include <vlc_vout.h>
#include <vlc_osd.h>
-#define HAS_SNAPSHOT 1
-
-#ifdef HAS_SNAPSHOT
-#include <snapshot.h>
-#endif
-
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
# include <sys/types.h>
#endif
-#define RAISE( c, m ) exception->code = c; \
- exception->message = strdup(m);
-
mediacontrol_RGBPicture *
mediacontrol_snapshot( mediacontrol_Instance *self,
const mediacontrol_Position * a_position,
mediacontrol_Exception *exception )
{
- mediacontrol_RGBPicture *retval = NULL;
- input_thread_t* p_input = self->p_playlist->p_input;
- vout_thread_t *p_vout = NULL;
- int i_datasize;
- snapshot_t **pointer;
- vlc_value_t val;
- int i_index;
- snapshot_t *p_best_snapshot;
- long searched_date;
-#ifdef HAS_SNAPSHOT
- int i_cachesize;
-#endif
-
- exception=mediacontrol_exception_init( exception );
-
- /*
- if( var_Get( self->p_vlc, "snapshot-id", &val ) == VLC_SUCCESS )
- p_vout = vlc_object_get( self->p_vlc, val.i_int );
- */
-
- /* FIXME: if in p_libvlc, we cannot have multiple video outputs */
- /* Once corrected, search for snapshot-id to modify all instances */
- if( var_Get( p_input, "snapshot-id", &val ) != VLC_SUCCESS )
+ vlc_object_t* p_cache;
+ vout_thread_t* p_vout;
+ input_thread_t *p_input;
+ mediacontrol_RGBPicture *p_pic = NULL;
+ char path[256];
+ snapshot_t *p_snapshot;
+ libvlc_exception_t ex;
+
+ libvlc_exception_init( &ex );
+ mediacontrol_exception_init( exception );
+
+ p_input = libvlc_get_input_thread( self->p_media_player, &ex );
+ if( ! p_input )
{
- RAISE( mediacontrol_InternalException, "No snapshot-id in p_input" );
- return NULL;
+ RAISE_NULL( mediacontrol_InternalException, "No input" );
}
- p_vout = vlc_object_get( self->p_vlc, val.i_int );
-
+ p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
if( ! p_vout )
{
- RAISE( mediacontrol_InternalException, "No snapshot module" );
- return NULL;
+ RAISE_NULL( mediacontrol_InternalException, "No video output" );
}
-
-#ifdef HAS_SNAPSHOT
- /* We test if the vout is a snapshot module. We cannot test
- pvout_psz_object_name( which is NULL ). But we can check if
- there are snapshot-specific variables */
- if( var_Get( p_vout, "snapshot-datasize", &val ) != VLC_SUCCESS )
+ p_cache = vlc_object_create( p_input, VLC_OBJECT_GENERIC );
+ if( p_cache == NULL )
{
- RAISE( mediacontrol_InternalException, "No snapshot module" );
vlc_object_release( p_vout );
- return NULL;
+ vlc_object_release( p_input );
+ RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
}
- i_datasize = val.i_int;
+ snprintf( path, 255, "object:%d", p_cache->i_object_id );
+ var_SetString( p_vout, "snapshot-path", path );
+ var_SetString( p_vout, "snapshot-format", "png" );
- /* Handle the a_position parameter */
- if( ! ( a_position->origin == mediacontrol_RelativePosition
- && a_position->value == 0 ) )
- {
- /* The position is not the current one. Go to it. */
- mediacontrol_set_media_position( self,
- ( mediacontrol_Position* ) a_position,
- exception );
- if( exception->code )
- {
- vlc_object_release( p_vout );
- return NULL;
- }
- }
-
- /* FIXME: We should not go further until we got past the position
- ( which means that we had the possibility to capture the right
- picture ). */
-
- vlc_mutex_lock( &p_vout->picture_lock );
-
- searched_date = mediacontrol_position2microsecond( p_input,
- ( mediacontrol_Position * ) a_position );
-
- var_Get( p_vout, "snapshot-cache-size", &val );
- i_cachesize = val.i_int ;
-
- var_Get( p_vout, "snapshot-list-pointer", &val );
- pointer = ( snapshot_t ** )val.p_address;
-
- if( ! pointer )
- {
- RAISE( mediacontrol_InternalException, "No available snapshot" );
-
- vlc_mutex_unlock( &p_vout->picture_lock );
- vlc_object_release( p_vout );
- return NULL;
- }
+ vlc_object_lock( p_cache );
+ vout_Control( p_vout, VOUT_SNAPSHOT );
+ vlc_object_wait( p_cache );
+ vlc_object_release( p_vout );
- /* Find the more appropriate picture, based on date */
- p_best_snapshot = pointer[0];
+ p_snapshot = ( snapshot_t* ) p_cache->p_private;
+ vlc_object_unlock( p_cache );
+ vlc_object_release( p_cache );
+ vlc_object_release( p_input );
- for( i_index = 1 ; i_index < i_cachesize ; i_index++ )
+ if( p_snapshot )
{
- long l_diff = pointer[i_index]->date - searched_date;
- if( l_diff > 0 && l_diff < abs( p_best_snapshot->date - searched_date ))
+ p_pic = private_mediacontrol_createRGBPicture( p_snapshot->i_width,
+ p_snapshot->i_height,
+ VLC_FOURCC( 'p','n','g',' ' ),
+ p_snapshot->date,
+ p_snapshot->p_data,
+ p_snapshot->i_datasize );
+ if( !p_pic )
{
- /* This one is closer, and _after_ the requested position */
- p_best_snapshot = pointer[i_index];
+ free( p_snapshot->p_data );
+ free( p_snapshot );
+ RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
}
}
-
- /* FIXME: add a test for the case that no picture matched the test
- ( we have p_best_snapshot == pointer[0] */
- retval = _mediacontrol_createRGBPicture( p_best_snapshot->i_width,
- p_best_snapshot->i_height,
- p_vout->output.i_chroma,
- p_best_snapshot->date,
- p_best_snapshot->p_data,
- i_datasize );
-
- vlc_mutex_unlock( &p_vout->picture_lock );
- vlc_object_release( p_vout );
-
-#endif
-
- return retval;
-}
-
-mediacontrol_RGBPicture **
-mediacontrol_all_snapshots( mediacontrol_Instance *self,
- mediacontrol_Exception *exception )
-{
- mediacontrol_RGBPicture **retval = NULL;
- vout_thread_t *p_vout = NULL;
- int i_datasize;
- int i_cachesize;
- vlc_value_t val;
- int i_index;
-#ifdef HAS_SNAPSHOT
- snapshot_t **pointer;
-#endif
-
- exception=mediacontrol_exception_init( exception );
-
- if( var_Get( self->p_playlist->p_input, "snapshot-id", &val ) == VLC_SUCCESS )
- p_vout = vlc_object_get( self->p_vlc, val.i_int );
-
- if( ! p_vout )
- {
- RAISE( mediacontrol_InternalException, "No snapshot module" );
- return NULL;
- }
-#ifdef HAS_SNAPSHOT
- /* We test if the vout is a snapshot module. We cannot test
- pvout_psz_object_name( which is NULL ). But we can check if
- there are snapshot-specific variables */
- if( var_Get( p_vout, "snapshot-datasize", &val ) != VLC_SUCCESS )
- {
- RAISE( mediacontrol_InternalException, "No snapshot module" );
- vlc_object_release( p_vout );
- return NULL;
- }
- i_datasize = val.i_int;
-
- vlc_mutex_lock( &p_vout->picture_lock );
-
- var_Get( p_vout, "snapshot-cache-size", &val );
- i_cachesize = val.i_int ;
-
- var_Get( p_vout, "snapshot-list-pointer", &val );
- pointer = ( snapshot_t ** )val.p_address;
-
- if( ! pointer )
- {
- RAISE( mediacontrol_InternalException, "No available picture" );
-
- vlc_mutex_unlock( &p_vout->picture_lock );
- vlc_object_release( p_vout );
- return NULL;
- }
-
- retval = ( mediacontrol_RGBPicture** )malloc( (i_cachesize + 1 ) * sizeof( char* ));
-
- for( i_index = 0 ; i_index < i_cachesize ; i_index++ )
+ else
{
- snapshot_t *p_s = pointer[i_index];
- mediacontrol_RGBPicture *p_rgb;
-
- p_rgb = _mediacontrol_createRGBPicture( p_s->i_width,
- p_s->i_height,
- p_vout->output.i_chroma,
- p_s->date,
- p_s->p_data,
- i_datasize );
-
- retval[i_index] = p_rgb;
+ RAISE_NULL( mediacontrol_InternalException, "Snapshot exception" );
}
-
- retval[i_cachesize] = NULL;
-
- vlc_mutex_unlock( &p_vout->picture_lock );
- vlc_object_release( p_vout );
-
-#endif
-
- return retval;
+ return p_pic;
}
+static
int mediacontrol_showtext( vout_thread_t *p_vout, int i_channel,
char *psz_string, text_style_t *p_style,
int i_flags, int i_hmargin, int i_vmargin,
}
p_spu->p_region->psz_text = strdup( psz_string );
+ p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK;
+ p_spu->p_region->p_style = p_style;
p_spu->i_start = i_start;
p_spu->i_stop = i_stop;
- p_spu->b_ephemer = VLC_FALSE;
- p_spu->b_absolute = VLC_FALSE;
+ p_spu->b_ephemer = false;
+ p_spu->b_absolute = false;
p_spu->i_x = i_hmargin;
p_spu->i_y = i_vmargin;
- p_spu->i_flags = i_flags;
+ p_spu->i_flags = i_flags & ~SUBPICTURE_ALIGN_MASK;
p_spu->i_channel = i_channel;
spu_DisplaySubpicture( p_vout->p_spu, p_spu );
const mediacontrol_Position * end,
mediacontrol_Exception *exception )
{
- input_thread_t *p_input = NULL;
vout_thread_t *p_vout = NULL;
char* psz_message;
+ input_thread_t *p_input;
+ libvlc_exception_t ex;
- psz_message = strdup( message );
- if( !psz_message )
+ libvlc_exception_init( &ex );
+ mediacontrol_exception_init( exception );
+
+ p_input = libvlc_get_input_thread( self->p_media_player, &ex );
+ if( ! p_input )
{
- RAISE( mediacontrol_InternalException, "No more memory" );
- return;
+ RAISE_VOID( mediacontrol_InternalException, "No input" );
}
-
- p_vout = vlc_object_find( self->p_playlist, VLC_OBJECT_VOUT, FIND_CHILD );
+ p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
if( ! p_vout )
{
- RAISE( mediacontrol_InternalException, "No video output" );
- return;
+ RAISE_VOID( mediacontrol_InternalException, "No video output" );
+ }
+
+ psz_message = strdup( message );
+ if( !psz_message )
+ {
+ RAISE_VOID( mediacontrol_InternalException, "no more memory" );
}
if( begin->origin == mediacontrol_RelativePosition &&
end->origin == mediacontrol_RelativePosition )
{
mtime_t i_duration = 0;
- mtime_t i_now = mdate();
+ mtime_t i_now = mdate();
- i_duration = 1000 * mediacontrol_unit_convert( self->p_playlist->p_input,
- end->key,
- mediacontrol_MediaTime,
- end->value );
+ i_duration = 1000 * private_mediacontrol_unit_convert(
+ self->p_media_player,
+ end->key,
+ mediacontrol_MediaTime,
+ end->value );
mediacontrol_showtext( p_vout, DEFAULT_CHAN, psz_message, NULL,
OSD_ALIGN_BOTTOM | OSD_ALIGN_LEFT, 0, 0,
{
mtime_t i_debut, i_fin, i_now;
- p_input = self->p_playlist->p_input;
- if( ! p_input )
- {
- RAISE( mediacontrol_InternalException, "No input" );
- vlc_object_release( p_vout );
- return;
- }
-
/* FIXME */
/* i_now = input_ClockGetTS( p_input, NULL, 0 ); */
i_now = mdate();
-
- i_debut = mediacontrol_position2microsecond( p_input,
- ( mediacontrol_Position* ) begin );
+
+ i_debut = private_mediacontrol_position2microsecond( self->p_media_player,
+ ( mediacontrol_Position* ) begin );
i_debut += i_now;
- i_fin = mediacontrol_position2microsecond( p_input,
- ( mediacontrol_Position * ) end );
+ i_fin = private_mediacontrol_position2microsecond( self->p_media_player,
+ ( mediacontrol_Position * ) end );
i_fin += i_now;
vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN, psz_message, NULL,
mediacontrol_sound_get_volume( mediacontrol_Instance *self,
mediacontrol_Exception *exception )
{
- short retval;
- audio_volume_t i_volume;
+ libvlc_exception_t ex;
+ int i_ret = 0;
- if( !self->p_intf )
- {
- RAISE( mediacontrol_InternalException, "No interface module" );
- return 0;
- }
- aout_VolumeGet( self->p_intf, &i_volume );
- retval = i_volume;
- return retval;
+ mediacontrol_exception_init( exception );
+ libvlc_exception_init( &ex );
+
+ i_ret = libvlc_audio_get_volume( self->p_instance, &ex );
+ HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
+ /* FIXME: Normalize in [0..100] */
+ return (unsigned short)i_ret;
}
void
const unsigned short volume,
mediacontrol_Exception *exception )
{
- if( !self->p_intf )
- {
- RAISE( mediacontrol_InternalException, "No interface module" );
- return;
- }
- aout_VolumeSet( self->p_intf,( audio_volume_t )volume );
+ /* FIXME: Normalize in [0..100] */
+ libvlc_exception_t ex;
+
+ mediacontrol_exception_init( exception );
+ libvlc_exception_init( &ex );
+
+ libvlc_audio_set_volume( self->p_instance, volume, &ex );
+ HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
-vlc_bool_t mediacontrol_set_visual( mediacontrol_Instance *self,
- WINDOWHANDLE visual_id,
- mediacontrol_Exception *exception )
+int mediacontrol_set_visual( mediacontrol_Instance *self,
+ WINDOWHANDLE visual_id,
+ mediacontrol_Exception *exception )
{
- vlc_value_t value;
- int ret;
+ libvlc_exception_t ex;
- if( !self->p_vlc )
- {
- RAISE( mediacontrol_InternalException, "No vlc reference" );
- return 0;
- }
- value.i_int=visual_id;
- ret = var_Set(self->p_vlc, "drawable", value);
-
- return (ret == VLC_SUCCESS);
+ mediacontrol_exception_init( exception );
+ libvlc_exception_init( &ex );
+
+ libvlc_media_player_set_drawable( self->p_media_player, (libvlc_drawable_t)visual_id, &ex );
+ HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
+ return true;
+}
+
+int
+mediacontrol_get_rate( mediacontrol_Instance *self,
+ mediacontrol_Exception *exception )
+{
+ libvlc_exception_t ex;
+ int i_ret;
+
+ mediacontrol_exception_init( exception );
+ libvlc_exception_init( &ex );
+
+ i_ret = libvlc_media_player_get_rate( self->p_media_player, &ex );
+ HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
+
+ return i_ret / 10;
+}
+
+void
+mediacontrol_set_rate( mediacontrol_Instance *self,
+ const int rate,
+ mediacontrol_Exception *exception )
+{
+ libvlc_exception_t ex;
+
+ mediacontrol_exception_init( exception );
+ libvlc_exception_init( &ex );
+
+ libvlc_media_player_set_rate( self->p_media_player, rate * 10, &ex );
+ HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+}
+
+int
+mediacontrol_get_fullscreen( mediacontrol_Instance *self,
+ mediacontrol_Exception *exception )
+{
+ libvlc_exception_t ex;
+ int i_ret;
+
+ mediacontrol_exception_init( exception );
+ libvlc_exception_init( &ex );
+
+ i_ret = libvlc_get_fullscreen( self->p_media_player, &ex );
+ HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
+
+ return i_ret;
+}
+
+void
+mediacontrol_set_fullscreen( mediacontrol_Instance *self,
+ const int b_fullscreen,
+ mediacontrol_Exception *exception )
+{
+ libvlc_exception_t ex;
+
+ mediacontrol_exception_init( exception );
+ libvlc_exception_init( &ex );
+
+ libvlc_set_fullscreen( self->p_media_player, b_fullscreen, &ex );
+ HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
projects / vlc / blobdiff