Commit 43e06934 authored by Laurent Aimar's avatar Laurent Aimar

Removed fake access.

parent e29b6d9c
...@@ -34,7 +34,6 @@ SOURCES_access_eyetv = eyetv.m ...@@ -34,7 +34,6 @@ SOURCES_access_eyetv = eyetv.m
SOURCES_dvdnav = dvdnav.c SOURCES_dvdnav = dvdnav.c
SOURCES_dvdread = dvdread.c SOURCES_dvdread = dvdread.c
SOURCES_dc1394 = dc1394.c SOURCES_dc1394 = dc1394.c
SOURCES_access_fake = fake.c
SOURCES_pvr = pvr.c videodev2.h SOURCES_pvr = pvr.c videodev2.h
SOURCES_v4l = v4l.c videodev_mjpeg.h SOURCES_v4l = v4l.c videodev_mjpeg.h
SOURCES_v4l2 = v4l2.c SOURCES_v4l2 = v4l2.c
...@@ -70,7 +69,6 @@ libvlc_LTLIBRARIES += \ ...@@ -70,7 +69,6 @@ libvlc_LTLIBRARIES += \
libaccess_tcp_plugin.la \ libaccess_tcp_plugin.la \
libaccess_http_plugin.la \ libaccess_http_plugin.la \
libaccess_ftp_plugin.la \ libaccess_ftp_plugin.la \
libaccess_fake_plugin.la \
libaccess_imem_plugin.la \ libaccess_imem_plugin.la \
libaccess_attachment_plugin.la \ libaccess_attachment_plugin.la \
$(NULL) $(NULL)
......
This diff is collapsed.
...@@ -596,7 +596,6 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na ...@@ -596,7 +596,6 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
if( module_exists ("dvdnav") ) if( module_exists ("dvdnav") )
TestCaC( "dvdnav-caching" ); TestCaC( "dvdnav-caching" );
TestCaC( "tcp-caching" ); TestCaC( "tcp-caching" );
TestCaC( "fake-caching" );
TestCaC( "cdda-caching" ); TestCaC( "cdda-caching" );
TestCaC( "screen-caching" ); TestCaC( "screen-caching" );
TestCaC( "vcd-caching" ); TestCaC( "vcd-caching" );
...@@ -956,7 +955,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -956,7 +955,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
i = i + config_SaveConfigFile( p_intf, "dvdnav" ); i = i + config_SaveConfigFile( p_intf, "dvdnav" );
} }
CaC( "tcp-caching" ); CaC( "vcd-caching" ); CaC( "tcp-caching" ); CaC( "vcd-caching" );
CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" );
CaC( "screen-caching" ); CaC( "screen-caching" );
CaCi( "rtsp-caching", 4 ); CaCi( "ftp-caching", 2 ); CaCi( "rtsp-caching", 4 ); CaCi( "ftp-caching", 2 );
CaCi( "http-caching", 4 ); CaCi( "http-caching", 4 );
...@@ -973,7 +972,6 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -973,7 +972,6 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
i = i + config_SaveConfigFile( p_intf, "access_http" ); i = i + config_SaveConfigFile( p_intf, "access_http" );
i = i + config_SaveConfigFile( p_intf, "access_file" ); i = i + config_SaveConfigFile( p_intf, "access_file" );
i = i + config_SaveConfigFile( p_intf, "access_tcp" ); i = i + config_SaveConfigFile( p_intf, "access_tcp" );
i = i + config_SaveConfigFile( p_intf, "access_fake" );
i = i + config_SaveConfigFile( p_intf, "cdda" ); i = i + config_SaveConfigFile( p_intf, "cdda" );
i = i + config_SaveConfigFile( p_intf, "screen" ); i = i + config_SaveConfigFile( p_intf, "screen" );
i = i + config_SaveConfigFile( p_intf, "vcd" ); i = i + config_SaveConfigFile( p_intf, "vcd" );
......
...@@ -489,7 +489,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -489,7 +489,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
if (module_exists ("dvdnav")) if (module_exists ("dvdnav"))
TestCaC( "dvdnav-caching" ); TestCaC( "dvdnav-caching" );
TestCaC( "tcp-caching" ); TestCaC( "tcp-caching" );
TestCaC( "fake-caching" ); TestCaC( "cdda-caching" ); TestCaC( "cdda-caching" );
TestCaC( "screen-caching" ); TestCaC( "vcd-caching" ); TestCaC( "screen-caching" ); TestCaC( "vcd-caching" );
#ifdef WIN32 #ifdef WIN32
TestCaC( "dshow-caching" ); TestCaC( "dshow-caching" );
...@@ -769,7 +769,7 @@ void SPrefsPanel::apply() ...@@ -769,7 +769,7 @@ void SPrefsPanel::apply()
if (module_exists ("dvdnav" )) if (module_exists ("dvdnav" ))
CaC( "dvdnav-caching" ); CaC( "dvdnav-caching" );
CaC( "tcp-caching" ); CaC( "vcd-caching" ); CaC( "tcp-caching" ); CaC( "vcd-caching" );
CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" );
CaC( "screen-caching" ); CaC( "bd-caching" ); CaC( "screen-caching" ); CaC( "bd-caching" );
CaCi( "rtsp-caching", 2 ); CaCi( "ftp-caching", 2 ); CaCi( "rtsp-caching", 2 ); CaCi( "ftp-caching", 2 );
CaCi( "http-caching", 2 ); CaCi( "http-caching", 2 );
......
...@@ -312,27 +312,12 @@ void formatSnapshotItem( input_item_t *p_item ) ...@@ -312,27 +312,12 @@ void formatSnapshotItem( input_item_t *p_item )
if( !p_item ) if( !p_item )
return; return;
char* psz_option = NULL;
char* psz_uri = input_item_GetURI( p_item ); char* psz_uri = input_item_GetURI( p_item );
if( !psz_uri )
goto end;
/* copy the snapshot mrl as a ArtURL */ /* copy the snapshot mrl as a ArtURL */
input_item_SetArtURL( p_item, psz_uri ); if( psz_uri )
input_item_SetArtURL( p_item, psz_uri );
if( asprintf( &psz_option, "fake-file=%s", psz_uri ) == -1 )
{
psz_option = NULL;
goto end;
}
/* display still image as a video */
input_item_SetURI( p_item, "fake://" );
input_item_AddOption( p_item, psz_option, VLC_INPUT_OPTION_TRUSTED );
end:
free( psz_option );
free( psz_uri ); free( psz_uri );
} }
......
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