/*****************************************************************************
* mms.c: MMS over tcp, udp and http access plug-in
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+ * Copyright (C) 2002-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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.
*****************************************************************************/
-
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_access.h>
#include "mms.h"
#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
- "Allows you to modify the default caching value for MMS streams. This " \
- "value should be set in millisecond units." )
+ "Caching value for MMS streams. This " \
+ "value should be set in milliseconds." )
#define ALL_TEXT N_("Force selection of all streams")
+#define ALL_LONGTEXT N_( \
+ "MMS streams can contain several elementary streams, with different " \
+ "bitrates. You can choose to select all of them." )
-#define BITRATE_TEXT N_("Select maximum bitrate stream")
+#define BITRATE_TEXT N_( "Maximum bitrate" )
#define BITRATE_LONGTEXT N_( \
- "Always select the stream with the maximum bitrate." )
+ "Select the stream with the maximum bitrate under that limit." )
+
+#define PROXY_TEXT N_("HTTP proxy")
+#define PROXY_LONGTEXT N_( \
+ "HTTP proxy to be used It must be of the form " \
+ "http://[user[:pass]@]myproxy.mydomain:myport/ ; " \
+ "if empty, the http_proxy environment variable will be tried." )
+
+#define TIMEOUT_TEXT N_("TCP/UDP timeout (ms)")
+#define TIMEOUT_LONGTEXT N_("Amount of time (in ms) to wait before aborting network reception of data. Note that there will be 10 retries before completely giving up.")
-vlc_module_begin();
- set_description( _("Microsoft Media Server (MMS) input") );
- set_capability( "access2", 0 );
+vlc_module_begin ()
+ set_shortname( "MMS" )
+ set_description( N_("Microsoft Media Server (MMS) input") )
+ set_capability( "access", -1 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACCESS )
- add_integer( "mms-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
- CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+ add_integer( "mms-caching", 19 * DEFAULT_PTS_DELAY / 1000,
+ CACHING_TEXT, CACHING_LONGTEXT, true )
- add_bool( "mms-all", 0, NULL, ALL_TEXT, "", VLC_TRUE );
- add_integer( "mms-maxbitrate", 0, NULL, BITRATE_TEXT, BITRATE_LONGTEXT ,
- VLC_FALSE );
+ add_integer( "mms-timeout", 5000, TIMEOUT_TEXT, TIMEOUT_LONGTEXT,
+ true )
- add_shortcut( "mms" );
- add_shortcut( "mmsu" );
- add_shortcut( "mmst" );
- add_shortcut( "mmsh" );
- set_callbacks( Open, Close );
-vlc_module_end();
+ add_bool( "mms-all", false, ALL_TEXT, ALL_LONGTEXT, true )
+ add_integer( "mms-maxbitrate", 0, BITRATE_TEXT, BITRATE_LONGTEXT ,
+ false )
+ add_string( "mmsh-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
+ false )
+
+ add_shortcut( "mms", "mmsu", "mmst", "mmsh", "http" )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
int i_proto;
};
-
/*****************************************************************************
* Open:
*****************************************************************************/
{
if( !strncmp( p_access->psz_access, "mmsu", 4 ) )
{
- return E_( MMSTUOpen )( p_access );
+ return MMSTUOpen ( p_access );
}
else if( !strncmp( p_access->psz_access, "mmst", 4 ) )
{
- return E_( MMSTUOpen )( p_access );
+ return MMSTUOpen ( p_access );
}
- else if( !strncmp( p_access->psz_access, "mmsh", 4 ) )
+ else if( !strncmp( p_access->psz_access, "mmsh", 4 ) ||
+ !strncmp( p_access->psz_access, "http", 4 ) )
{
- return E_( MMSHOpen )( p_access );
+ return MMSHOpen ( p_access );
}
}
- if( E_( MMSTUOpen )( p_access ) )
+ if( MMSTUOpen ( p_access ) )
{
+ if( p_access->b_die )
+ return VLC_EGENERIC;
+
/* try mmsh if mmstu failed */
- return E_( MMSHOpen )( p_access );
+ return MMSHOpen ( p_access );
}
return VLC_SUCCESS;
}
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys = p_access->p_sys;
- if( p_sys->i_proto == MMS_PROTO_TCP || p_sys->i_proto == MMS_PROTO_UDP )
+ if( ( p_sys->i_proto == MMS_PROTO_TCP ) ||
+ ( p_sys->i_proto == MMS_PROTO_UDP ) )
{
- E_( MMSTUClose )( p_access );
+ MMSTUClose ( p_access );
}
else if( p_sys->i_proto == MMS_PROTO_HTTP )
{
- E_( MMSHClose )( p_access );
+ MMSHClose ( p_access );
}
}