# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_demux.h>
#include "playlist.h"
struct demux_sys_t
{
- playlist_t *p_playlist;
input_item_t *p_current_input;
};
/*****************************************************************************
* Import_GVP: main import function
*****************************************************************************/
-int E_(Import_GVP)( vlc_object_t *p_this )
+int Import_GVP( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
int i_peek, i, b_found = false;
p_demux->pf_control = Control;
p_demux->pf_demux = Demux;
MALLOC_ERR( p_demux->p_sys, demux_sys_t );
- p_demux->p_sys->p_playlist = NULL;
return VLC_SUCCESS;
}
/*****************************************************************************
* Deactivate: frees unused data
*****************************************************************************/
-void E_(Close_GVP)( vlc_object_t *p_this )
+void Close_GVP( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- if( p_sys->p_playlist )
- vlc_object_release( p_sys->p_playlist );
free( p_sys );
}
INIT_PLAYLIST_STUFF;
- p_sys->p_playlist = p_playlist;
p_sys->p_current_input = p_current_input;
while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
}
else
{
- p_input = input_ItemNewExt( p_sys->p_playlist,
+ p_input = input_ItemNewExt( p_demux,
psz_url, psz_title, 0, NULL, -1 );
#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \
p_input, _("Google Video"), _(type), "%s", field ) ; }
free( psz_title );
free( psz_description );
- p_sys->p_playlist = NULL;
-
return 0; /* Needed for correct operation of go back */
}