/*****************************************************************************
* media_player.c: Libvlc API Media Instance management functions
*****************************************************************************
- * Copyright (C) 2005-2009 the VideoLAN team
- * $Id$
+ * Copyright (C) 2005-2011 VLC authors and VideoLAN
*
* Authors: Clément Stenac <zorglub@videolan.org>
*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#include "media_internal.h" // libvlc_media_set_state()
#include "media_player_internal.h"
-/*
- * mapping of libvlc_navigate_mode_t to vlc_action_t
- */
-static const vlc_action_t libvlc_navigate_to_action[] =
-{
- ACTIONID_NAV_ACTIVATE,
- ACTIONID_NAV_UP,
- ACTIONID_NAV_DOWN,
- ACTIONID_NAV_LEFT,
- ACTIONID_NAV_RIGHT
-};
-
-static const uint32_t libvlc_navigate_to_action_size = \
- sizeof( libvlc_navigate_to_action ) / sizeof( libvlc_navigate_to_action[0] );
-
-
static int
input_seekable_changed( vlc_object_t * p_this, char const * psz_cmd,
vlc_value_t oldval, vlc_value_t newval,
return VLC_SUCCESS;
}
-static input_thread_t *find_input (vlc_object_t *obj)
-{
- libvlc_media_player_t *mp = (libvlc_media_player_t *)obj;
-
- return libvlc_get_input_thread (mp);
-}
-
/* */
static void libvlc_media_player_destroy( libvlc_media_player_t * );
var_Create (mp, "vmem-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
var_Create (mp, "vmem-pitch", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
var_Create (mp, "drawable-xid", VLC_VAR_INTEGER);
-#ifdef WIN32
+#if defined (WIN32) || defined (__OS2__)
var_Create (mp, "drawable-hwnd", VLC_VAR_INTEGER);
#endif
#ifdef __APPLE__
/* Audio */
var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
var_Create (mp, "mute", VLC_VAR_BOOL);
- var_Create (mp, "volume", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
- var_Create (mp, "find-input-callback", VLC_VAR_ADDRESS);
- var_SetAddress (mp, "find-input-callback", find_input);
+ var_Create (mp, "volume", VLC_VAR_FLOAT);
+ var_Create (mp, "corks", VLC_VAR_INTEGER);
var_Create (mp, "amem-data", VLC_VAR_ADDRESS);
var_Create (mp, "amem-setup", VLC_VAR_ADDRESS);
- var_Create (mp, "amem-close", VLC_VAR_ADDRESS);
+ var_Create (mp, "amem-cleanup", VLC_VAR_ADDRESS);
var_Create (mp, "amem-play", VLC_VAR_ADDRESS);
var_Create (mp, "amem-pause", VLC_VAR_ADDRESS);
var_Create (mp, "amem-resume", VLC_VAR_ADDRESS);
mp->state = libvlc_NothingSpecial;
mp->p_libvlc_instance = instance;
mp->input.p_thread = NULL;
- mp->input.p_resource = NULL;
+ mp->input.p_resource = input_resource_New(VLC_OBJECT(mp));
+ if (unlikely(mp->input.p_resource == NULL))
+ {
+ vlc_object_release(mp);
+ return NULL;
+ }
vlc_mutex_init (&mp->input.lock);
mp->i_refcount = 1;
mp->p_event_manager = libvlc_event_manager_new(mp, instance);
if (unlikely(mp->p_event_manager == NULL))
{
+ input_resource_Release(mp->input.p_resource);
vlc_object_release(mp);
return NULL;
}
/* No need for lock_input() because no other threads knows us anymore */
if( p_mi->input.p_thread )
release_input_thread(p_mi, true);
- if( p_mi->input.p_resource )
- {
- input_resource_Terminate( p_mi->input.p_resource );
- input_resource_Release( p_mi->input.p_resource );
- p_mi->input.p_resource = NULL;
- }
+ input_resource_Terminate( p_mi->input.p_resource );
+ input_resource_Release( p_mi->input.p_resource );
vlc_mutex_destroy( &p_mi->input.lock );
libvlc_event_manager_release( p_mi->p_event_manager );
return -1;
}
- if( !p_mi->input.p_resource )
- p_mi->input.p_resource = input_resource_New( VLC_OBJECT( p_mi ) );
p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
p_mi->input.p_resource );
unlock(p_mi);
libvlc_event_send( p_mi->p_event_manager, &event );
}
- if( p_mi->input.p_resource != NULL )
- input_resource_Terminate( p_mi->input.p_resource );
+ input_resource_Terminate( p_mi->input.p_resource );
unlock_input(p_mi);
}
void *drawable )
{
assert (p_mi != NULL);
-#ifdef WIN32
+#if defined (WIN32) || defined (__OS2__)
var_SetString (p_mi, "window",
(drawable != NULL) ? "embed-hwnd,any" : "");
var_SetInteger (p_mi, "drawable-hwnd", (uintptr_t)drawable);
void *libvlc_media_player_get_hwnd( libvlc_media_player_t *p_mi )
{
assert (p_mi != NULL);
-#ifdef WIN32
+#if defined (WIN32) || defined (__OS2__)
return (void *)(uintptr_t)var_GetInteger (p_mi, "drawable-hwnd");
#else
return NULL;
if ( !p_input_thread )
return false;
- b_will_play = !p_input_thread->b_die && !p_input_thread->b_dead;
+ b_will_play = !p_input_thread->b_dead;
vlc_object_release( p_input_thread );
return b_will_play;
}
void libvlc_media_player_navigate( libvlc_media_player_t* p_mi,
- unsigned navigate )
+ unsigned navigate )
{
- input_thread_t *p_input_thread;
+ static const vlc_action_t map[] =
+ {
+ INPUT_NAV_ACTIVATE, INPUT_NAV_UP, INPUT_NAV_DOWN,
+ INPUT_NAV_LEFT, INPUT_NAV_RIGHT,
+ };
- if ( navigate > libvlc_navigate_to_action_size)
+ if( navigate >= sizeof(map) / sizeof(map[0]) )
return;
- p_input_thread = libvlc_get_input_thread ( p_mi );
- if ( !p_input_thread )
+ input_thread_t *p_input = libvlc_get_input_thread ( p_mi );
+ if ( p_input == NULL )
return;
- var_SetInteger( p_mi->p_libvlc_instance->p_libvlc_int,
- "key-action", libvlc_navigate_to_action[navigate] );
-
- vlc_object_release( p_input_thread );
+ input_Control( p_input, map[navigate], NULL );
+ vlc_object_release( p_input );
}
/* internal function, used by audio, video */
malloc( sizeof( libvlc_track_description_t ) );
if ( !p_actual )
{
- libvlc_track_description_release( p_track_description );
+ libvlc_track_description_list_release( p_track_description );
libvlc_printerr( "Not enough memory" );
goto end;
}
return p_track_description;
}
+// Deprecated alias for libvlc_track_description_list_release
void libvlc_track_description_release( libvlc_track_description_t *p_td )
+{
+ libvlc_track_description_list_release( p_td );
+}
+
+void libvlc_track_description_list_release( libvlc_track_description_t *p_td )
{
libvlc_track_description_t *p_actual, *p_before;
p_actual = p_td;
projects / vlc / blobdiff