Changeset 68aa3ca3202b0f2c7e3b10db9dbe46b436b17bbd

Timestamp:

01/08/06 17:32:33 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1136737953 +0000

git-parent:

[91c8dba080d1e67f93964f510e6fb18b15a1bc5b]

git-author:

Clément Stenac <zorglub@videolan.org> 1136737953 +0000

Message:

Merge 0.8.5-api changes
Fix compilation

Files:

• Makefile.am (modified) (5 diffs)
• bindings/python/setup.py (modified) (1 diff)
• bindings/python/vlcglue.h (modified) (1 diff)
• include/libvlc_internal.h (added)
• include/mediacontrol_internal.h (added)
• include/vlc/control.h (deleted)
• include/vlc/control_structures.h (deleted)
• include/vlc/libvlc.h (added)
• include/vlc/mediacontrol.h (added)
• include/vlc/mediacontrol_structures.h (added)
• include/vlc/vlc.h (modified) (2 diffs)
• include/vlc_common.h (modified) (1 diff)
• include/vlc_control.h (deleted)
• src/control/audio_video.c (deleted)
• src/control/core.c (modified) (2 diffs)
• src/control/init.c (deleted)
• src/control/input.c (added)
• src/control/mediacontrol_audio_video.c (added)
• src/control/mediacontrol_core.c (added)
• src/control/mediacontrol_init.c (added)
• src/control/mediacontrol_plugin.c (added)
• src/control/mediacontrol_util.c (added)
• src/control/playlist.c (added)
• src/control/plugin.c (deleted)
• src/control/util.c (deleted)
• src/misc/stats.c (modified) (2 diffs)
• test/libvlc_sample.c (added)

Makefile.am

@@ -64 +64 @@
-dist_pkginclude_HEADERS = \
-    include/vlc/vlc.h \
+    include/vlc/libvlc.h \
-    include/vlc/aout.h \
-    include/vlc/vout.h \
@@ -70 +71 @@
-    include/vlc/input.h \
-    include/vlc/intf.h \
-
-
+media
+media
-    $(NULL)
-
@@ -106 +107 @@
-    include/vlc_common.h \
-    include/vlc_config.h \
-    include/vlc_control.h \
-    include/vlc_cpu.h \
-    include/vlc_demux.h \
@@ -138 +138 @@
-    include/vout_synchro.h \
-    include/win32_specific.h \
+    include/libvlc_internal.h \
+    include/mediacontrol_internal.h
-    $(NULL)
-
@@ -472 +474 @@
-    src/extras/libc.c \
-    src/control/core.c \
-
-
+
+
+
+
+
-    $(NULL)
-
-# These should be distributed, but not compiled
-init.c src/control/
+mediacontrol_init.c src/control/mediacontrol_
-
-SOURCES_libvlc = \

bindings/python/setup.py

@@ -49 +49 @@
-vlclocal = Extension('vlc',
-                sources = ['vlcglue.c',
-
+mediacontrol_
-                include_dirs = ['../../include', '../../', '/usr/win32/include' ],
-                extra_objects = [ '../../lib/libvlc_pic.a' ],

bindings/python/vlcglue.h

@@ -30 +30 @@
-#include <stdio.h>
-#include <vlc/vlc.h>
-
-
+media
+media
-
-#define SELF ((MediaControl*)self)

include/vlc/vlc.h

@@ -1 +1 @@
-/*****************************************************************************
-vlc
+libvlc (old-style)
- *****************************************************************************
- * Copyright (C) 1998-2004 the VideoLAN team
@@ -26 +26 @@
-
-/**
- Libvlc
+_old Libvlc Old
- * This is libvlc, the base library of the VLC program.
+ * This is the legacy API. Please consider using the new libvlc API
- *
- * @{

include/vlc_common.h

@@ -420 +420 @@
-typedef struct counter_sample_t counter_sample_t;
-typedef struct stats_handler_t stats_handler_t;
+typedef struct input_stats_t input_stats_t;
-
-

src/control/core.c

@@ -1 +1 @@
-/*****************************************************************************
-functions : init, playlist, stream management
+libvlc new API functions : initialization, exceptions handling
- *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
- * $Id$
- *
-Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr
+Cl�nt Stenac <zorglub@videolan.org
- *
- * This program is free software; you can redistribute it and/or modify
@@ -22 +22 @@
- *****************************************************************************/
-
-vlc_contro
-control
+libvlc_interna
+libvlc
-
-#include <vlc/intf.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
-#include <vlc_demux.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 <errno.h>                                                 /* ENOMEM */
-#include <stdio.h>
-#include <ctype.h>
-
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#endif
-
-#define RAISE( c, m )  exception->code = c; \
-                       exception->message = strdup(m);
-
-vlc_t * vlc_current_object( int );
-
-
-
+
+
+
+
-{
-mediacontrol_Instance* retval
-vlc_object_t *p_vlc
-
+p_exception->b_raised = 0
+p_exception->psz_message = NULL
+
-
-
-
+
+
+
+
+
+
+
+
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return NULL;
-    }
-
-
-
+
+
+
+
+
+
+
-    {
-RAISE( mediacontrol_InternalException, "Unable to initialize VLC
+libvlc_exception_raise( p_exception, "Playlist creation failed
-        return NULL;
-    }
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
-
-
-
-
-
+
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
-/* Starts playing a stream */
-/*
- * Known issues: since moving in the playlist using playlist_Next
- * or playlist_Prev implies starting to play items, the a_position
- * argument will be only honored for the 1st item in the list.
- * 
- * XXX:FIXME split moving in the playlist and playing items two
- * different actions or make playlist_<Next|Prev> accept a time
- * value to start to play from.
- */
-void
-mediacontrol_start( mediacontrol_Instance *self,
-                    const mediacontrol_Position * a_position,
-                    mediacontrol_Exception *exception )
-{
-    playlist_t * p_playlist = self->p_playlist;
-
-    exception = mediacontrol_exception_init( exception );
-    if( ! p_playlist )
-    {
-        RAISE( mediacontrol_PlaylistException, "No available playlist" );
-        return;
-    }
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-    if( p_playlist->i_size )
-    {
-        int i_index;
-        int i_from;
-    char * psz_from = ( char * )malloc( 20 * sizeof( char ) );
-
-        i_from = mediacontrol_position2microsecond( p_playlist->p_input, a_position ) / 1000000;
-    
-        i_index = p_playlist->i_index;
-        if( i_index < 0 )
-        { 
-            /* We know that there is at least 1 element, since i_size != 0 */
-            i_index = 0;
-        }
-
-        /* Set start time */
-    snprintf( psz_from, 20, "start-time=%i", i_from );
-    playlist_ItemAddOption( p_playlist->pp_items[i_index], psz_from );
-    free( psz_from );
-
-        vlc_mutex_unlock( &p_playlist->object_lock );
-
-        playlist_Play( p_playlist );
-    }
-    else
-    {
-        RAISE( mediacontrol_PlaylistException, "Empty playlist." );
-        vlc_mutex_unlock( &p_playlist->object_lock );
-    }
-
-    return;
-}
-
-void
-mediacontrol_pause( mediacontrol_Instance *self,
-                    const mediacontrol_Position * a_position,
-                    mediacontrol_Exception *exception )
-{
-    input_thread_t *p_input = self->p_playlist->p_input;
-
-    /* FIXME: use the a_position parameter */
-    exception=mediacontrol_exception_init( exception );
-    if( p_input != NULL )
-    {
-        var_SetInteger( p_input, "state", PAUSE_S );
-    }
-    else
-    {
-        RAISE( mediacontrol_InternalException, "No input" );
-    }
-
-    return;
-}
-
-void
-mediacontrol_resume( mediacontrol_Instance *self,
-                     const mediacontrol_Position * a_position,
-                     mediacontrol_Exception *exception )
-{
-    input_thread_t *p_input = self->p_playlist->p_input;
-
-    /* FIXME: use the a_position parameter */
-    exception=mediacontrol_exception_init( exception );
-    if( p_input != NULL )
-    {
-        var_SetInteger( p_input, "state", PAUSE_S );
-    }
-    else
-    {
-        RAISE( mediacontrol_InternalException, "No input" );
-    }
-}
-
-void
-mediacontrol_stop( mediacontrol_Instance *self,
-                   const mediacontrol_Position * a_position,
-                   mediacontrol_Exception *exception )
-{
-    /* FIXME: use the a_position parameter */
-    exception=mediacontrol_exception_init( exception );
-    if( !self->p_playlist )
-    {
-        RAISE( mediacontrol_PlaylistException, "No playlist" );
-        return;
-    }
-
-    playlist_Stop( self->p_playlist );
-}
-
-/**************************************************************************
- * Playlist management
- **************************************************************************/
-
-void
-mediacontrol_playlist_add_item( mediacontrol_Instance *self,
-                                const char * psz_file,
-                                mediacontrol_Exception *exception )
-{
-    exception=mediacontrol_exception_init( exception );
-    if( !self->p_playlist )
-    {
-        RAISE( mediacontrol_InternalException, "No playlist" );
-        return;
-    }
-
-    playlist_Add( self->p_playlist, psz_file, psz_file , PLAYLIST_INSERT,
-                  PLAYLIST_END );
-}
-
-void
-mediacontrol_playlist_next_item( mediacontrol_Instance *self,
-                 mediacontrol_Exception *exception )
-{
-    exception=mediacontrol_exception_init( exception );
-    if ( !self->p_playlist )
-    {
-        RAISE( mediacontrol_InternalException, "No playlist" );
-        return;
-    }
-
-    playlist_Next( self->p_playlist );
-
-    return;
-}
-
-void
-mediacontrol_playlist_clear( mediacontrol_Instance *self,
-                             mediacontrol_Exception *exception )
-{
-    exception=mediacontrol_exception_init( exception );
-    if( !self->p_playlist )
-    {
-        RAISE( mediacontrol_PlaylistException, "No playlist" );
-        return;
-    }
-
-    playlist_Clear( self->p_playlist );
-
-    return;
-}
-
-mediacontrol_PlaylistSeq *
-mediacontrol_playlist_get_list( mediacontrol_Instance *self,
-                                mediacontrol_Exception *exception )
-{
-    mediacontrol_PlaylistSeq *retval;
-    int i_index;
-    playlist_t * p_playlist = self->p_playlist;
-    int i_playlist_size;
-
-    exception=mediacontrol_exception_init( exception );
-    if( !p_playlist )
-    {
-        RAISE( mediacontrol_PlaylistException, "No playlist" );
-        return NULL;
-    }
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-    i_playlist_size = p_playlist->i_size;
-
-    retval = mediacontrol_PlaylistSeq__alloc( i_playlist_size );
-
-    for( i_index = 0 ; i_index < i_playlist_size ; i_index++ )
-    {
-        retval->data[i_index] = strdup( p_playlist->pp_items[i_index]->input.psz_uri );
-    }
-    vlc_mutex_unlock( &p_playlist->object_lock );
-
-    return retval;
-}
-
-/***************************************************************************
- * Status feedback
- ***************************************************************************/
-
-mediacontrol_StreamInformation *
-mediacontrol_get_stream_information( mediacontrol_Instance *self,
-                                     mediacontrol_PositionKey a_key,
-                                     mediacontrol_Exception *exception )
-{
-    mediacontrol_StreamInformation *retval;
-    input_thread_t *p_input = self->p_playlist->p_input;
-    vlc_value_t val;
-
-    retval = ( mediacontrol_StreamInformation* )malloc( sizeof( mediacontrol_StreamInformation ) );
-    if( ! retval )
-    {
-        RAISE( mediacontrol_InternalException, "Out of memory" );
-        return NULL;
-    }
-
-    if( ! p_input )
-    {
-        /* No p_input defined */
-        retval->streamstatus = mediacontrol_UndefinedStatus;
-        retval->url          = strdup( "None" );
-        retval->position     = 0;
-        retval->length       = 0;
-    }
-    else
-    {
-        switch( var_GetInteger( p_input, "state" ) )
-        {
-        case PLAYING_S     :
-            retval->streamstatus = mediacontrol_PlayingStatus;
-            break;
-        case PAUSE_S       :
-            retval->streamstatus = mediacontrol_PauseStatus;
-            break;
-        case INIT_S        :
-            retval->streamstatus = mediacontrol_InitStatus;
-            break;
-        case END_S         :
-            retval->streamstatus = mediacontrol_EndStatus;
-            break;
-        default :
-            retval->streamstatus = mediacontrol_UndefinedStatus;
-            break;
-        }
-
-        retval->url = strdup( p_input->input.p_item->psz_uri );
-
-        /* TIME and LENGTH are in microseconds. We want them in ms */
-        var_Get( p_input, "time", &val);
-        retval->position = val.i_time / 1000;
-
-        var_Get( p_input, "length", &val);
-        retval->length = val.i_time / 1000;
-
-        retval->position = mediacontrol_unit_convert( p_input,
-                                                      mediacontrol_MediaTime, a_key,
-                                                      retval->position );
-        retval->length   = mediacontrol_unit_convert( p_input,
-                                                      mediacontrol_MediaTime, a_key,
-                                                      retval->length );
-    }
-    return retval;
-}

src/misc/stats.c

@@ -97 +97 @@
-    case STATS_LAST:
-    case STATS_MIN:
-LAST
+MAX
-        if( p_counter->i_samples > 1)
-        {
@@ -250 +250 @@
-    int i;
-    /* read_packets and read_bytes are common to all streams */
-
-
-
-
+//
+// 
+
+