From: Gildas Bazin Date: Thu, 22 May 2003 12:00:57 +0000 (+0000) Subject: * INSTALL.win32: added a small note about running vlc under the msvc debugger. X-Git-Tag: 0.6.0~230 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8aa24cfe361b893a626016211e05f41c544f5c1b;p=vlc * INSTALL.win32: added a small note about running vlc under the msvc debugger. * modules/gui/wxwindows/*: small fixes. * modules/access/vcd/*, modules/access/cdda.c: re-activated autodetection of vcd and cdda on win32. * src/misc/cpu.c, src/stream_output/announce.c: msvc fixes. --- diff --git a/INSTALL.win32 b/INSTALL.win32 index 0262974d1f..1239f43eeb 100644 --- a/INSTALL.win32 +++ b/INSTALL.win32 @@ -1,4 +1,4 @@ -$Id: INSTALL.win32,v 1.14 2003/05/17 23:57:35 gbazin Exp $ +$Id: INSTALL.win32,v 1.15 2003/05/22 12:00:56 gbazin Exp $ INSTALL file for the Windows9x/Me/NT4/2k/XP version of the VLC media player @@ -45,6 +45,9 @@ If you want to build VLC from sources, you can do it in several ways: experiment/play with some basic functionnalities in vlc. The reason for this is that vlc depends on a lot of 3rd party libraries and building them in MSVC is not convenient and sometimes even impossible. + ( NOTE: if you want to run vlc under the msvc debugger, you need to run it + with the --fast-mutex --win9x-cv-method=1 options because the debugger + usually loses signals sent by PulseEvent() ) - or on Linux, using the mingw32 cross-compiler. diff --git a/modules/access/cdda.c b/modules/access/cdda.c index ecb51690a9..361cb1e2dd 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -2,7 +2,7 @@ * cdda.c : CD digital audio input module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: cdda.c,v 1.3 2003/05/19 20:47:16 gbazin Exp $ + * $Id: cdda.c,v 1.4 2003/05/22 12:00:56 gbazin Exp $ * * Authors: Laurent Aimar * Gildas Bazin @@ -117,12 +117,6 @@ static int CDDAOpen( vlc_object_t *p_this ) int i_title = 1; vcddev_t *vcddev; -#ifdef WIN32 - /* On Win32 we want the CDDA access plugin to be explicitly requested, - * we end up with lots of problems otherwise */ - if( !p_input->psz_access || !*p_input->psz_access ) return( -1 ); -#endif - /* parse the options passed in command line : */ psz_orig = psz_parser = psz_source = strdup( p_input->psz_name ); diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c index 66deea922d..5c04bd1a58 100644 --- a/modules/access/vcd/cdrom.c +++ b/modules/access/vcd/cdrom.c @@ -2,7 +2,7 @@ * cdrom.c: cdrom tools ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: cdrom.c,v 1.11 2003/05/18 15:44:03 gbazin Exp $ + * $Id: cdrom.c,v 1.12 2003/05/22 12:00:57 gbazin Exp $ * * Authors: Johan Bilien * Gildas Bazin @@ -101,8 +101,7 @@ vcddev_t *ioctl_Open( vlc_object_t *p_this, const char *psz_dev ) * Check if we are dealing with a device or a file (vcd image) */ #ifdef WIN32 - if( strlen( psz_dev ) == 1 || - (strlen( psz_dev ) == 2 && psz_dev[1] == ':') ) + if( (strlen( psz_dev ) == 2 && psz_dev[1] == ':') ) { b_is_file = 0; } diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c index 0a10eb70b7..57e1cbf534 100644 --- a/modules/access/vcd/vcd.c +++ b/modules/access/vcd/vcd.c @@ -2,7 +2,7 @@ * vcd.c : VCD input module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: vcd.c,v 1.21 2003/05/18 15:44:03 gbazin Exp $ + * $Id: vcd.c,v 1.22 2003/05/22 12:00:57 gbazin Exp $ * * Author: Johan Bilien * @@ -103,12 +103,6 @@ static int VCDOpen( vlc_object_t *p_this ) int i_chapter = 1; vcddev_t *vcddev; -#ifdef WIN32 - /* On Win32 we want the VCD access plugin to be explicitly requested, - * we end up with lots of problems otherwise */ - if( !p_input->psz_access || !*p_input->psz_access ) return( -1 ); -#endif - /* parse the options passed in command line : */ psz_orig = psz_parser = psz_source = strdup( p_input->psz_name ); diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp index 6b21a5d260..f217ba14cd 100644 --- a/modules/gui/wxwindows/interface.cpp +++ b/modules/gui/wxwindows/interface.cpp @@ -2,7 +2,7 @@ * interface.cpp : wxWindows plugin for vlc ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: interface.cpp,v 1.31 2003/05/20 23:17:59 gbazin Exp $ + * $Id: interface.cpp,v 1.32 2003/05/22 12:00:56 gbazin Exp $ * * Authors: Gildas Bazin * @@ -845,7 +845,7 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord, for( size_t i = 0; i < filenames.GetCount(); i++ ) playlist_Add( p_playlist, (const char *)filenames[i].mb_str(), - PLAYLIST_APPEND | i ? 0 : PLAYLIST_GO, PLAYLIST_END ); + PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO), PLAYLIST_END ); vlc_object_release( p_playlist ); diff --git a/modules/gui/wxwindows/streamout.cpp b/modules/gui/wxwindows/streamout.cpp index 1306e31850..6031c1bca2 100644 --- a/modules/gui/wxwindows/streamout.cpp +++ b/modules/gui/wxwindows/streamout.cpp @@ -2,7 +2,7 @@ * streamout.cpp : wxWindows plugin for vlc ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: streamout.cpp,v 1.13 2003/05/20 23:17:59 gbazin Exp $ + * $Id: streamout.cpp,v 1.14 2003/05/22 12:00:56 gbazin Exp $ * * Authors: Gildas Bazin * @@ -168,7 +168,7 @@ SoutDialog::SoutDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ): wxHORIZONTAL ); wxStaticText *mrl_label = new wxStaticText( panel, -1, wxU(_("Destination Target:"))); - mrl_combo = new wxComboBox( panel, MRL_Event, mrl, + mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""), wxPoint(20,25), wxSize(120, -1), 0, NULL ); mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing " "the full MRL you want to open.\n""Alternatively, the field will be " @@ -215,9 +215,6 @@ SoutDialog::SoutDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ): main_sizer->Add( panel, 1, wxGROW, 0 ); main_sizer->Layout(); SetSizerAndFit( main_sizer ); - - /* Update all the values */ - //ParseMRL(); } SoutDialog::~SoutDialog() @@ -320,11 +317,9 @@ void SoutDialog::UpdateMRL() } if( !transcode.IsEmpty() || !duplicate.IsEmpty() ) - mrl = wxT("#") + transcode + duplicate; + mrl_combo->SetValue( wxT("#") + transcode + duplicate ); else - mrl = wxT(""); - - mrl_combo->SetValue( mrl ); + mrl_combo->SetValue( wxT("") ); } wxPanel *SoutDialog::AccessPanel( wxWindow* parent ) @@ -583,96 +578,13 @@ wxPanel *SoutDialog::TranscodingPanel( wxWindow* parent ) return panel; } -#if 0 -void SoutDialog::ParseMRL() -{ - /* Initialise MRL value */ - char *psz_sout = config_GetPsz( p_intf, "sout" ); - if( psz_sout ) - { - mrl = wxU(psz_sout); - free( psz_sout ); - } - - /* Parse the MRL */ - wxString access = mrl.BeforeFirst( wxT('/') ); - wxString encapsulation = mrl.BeforeFirst( wxT(':') ).AfterFirst(wxT('/')); - - if( !access.Cmp( wxT("http") ) ) - { - i_access_type = HTTP_ACCESS_OUT; - } - else if( !access.Cmp( wxT("udp") ) ) - { - i_access_type = UDP_ACCESS_OUT; - } - else if( !access.Cmp( wxT("rtp") ) ) - { - i_access_type = RTP_ACCESS_OUT; - } - else - { - i_access_type = FILE_ACCESS_OUT; - } - - if( !encapsulation.Cmp( wxT("ps") ) ) - { - i_encapsulation_type = PS_ENCAPSULATION; - } - else if( !encapsulation.Cmp( wxT("avi") ) ) - { - i_encapsulation_type = AVI_ENCAPSULATION; - } - else if( !encapsulation.Cmp( wxT("ogg") ) ) - { - i_encapsulation_type = OGG_ENCAPSULATION; - } - else - { - i_encapsulation_type = TS_ENCAPSULATION; - } - - wxString second_part = mrl.AfterFirst( wxT(':') ); - - if( i_access_type == FILE_ACCESS_OUT ) - { - /* The whole second part of the MRL is the filename */ - file_combo->SetValue( second_part ); - } - else - { - /* we've got address:port */ - wxString address = second_part.BeforeLast( wxT(':') ); - net_addr->SetValue( address ); - - long int i_port; - wxString port = second_part.AfterLast( wxT(':') ); - if( port.ToLong( &i_port ) ) - { - net_port->SetValue( i_port ); - } - else - { - net_port->SetValue( config_GetInt( p_intf, "server-port" ) ); - } - } - - /* Update access output panel */ - wxCommandEvent dummy_event; - dummy_event.SetId( AccessType1_Event + i_access_type ); - OnAccessTypeChange( dummy_event ); - - /* Update encapsulation output panel */ - dummy_event.SetId( EncapsulationRadio1_Event + i_encapsulation_type ); - OnEncapsulationChange( dummy_event ); -} -#endif - /***************************************************************************** * Events methods. *****************************************************************************/ void SoutDialog::OnOk( wxCommandEvent& WXUNUSED(event) ) { + mrl_combo->Append( mrl_combo->GetValue() ); + mrl = mrl_combo->GetValue(); EndModal( wxID_OK ); } @@ -683,7 +595,7 @@ void SoutDialog::OnCancel( wxCommandEvent& WXUNUSED(event) ) void SoutDialog::OnMRLChange( wxCommandEvent& event ) { - mrl = event.GetString(); + //mrl = event.GetString(); } /***************************************************************************** diff --git a/src/misc/cpu.c b/src/misc/cpu.c index a5a0c8dce8..4bb301f463 100644 --- a/src/misc/cpu.c +++ b/src/misc/cpu.c @@ -2,7 +2,7 @@ * cpu.c: CPU detection code ***************************************************************************** * Copyright (C) 1998-2002 VideoLAN - * $Id: cpu.c,v 1.10 2002/12/06 16:34:08 sam Exp $ + * $Id: cpu.c,v 1.11 2003/05/22 12:00:57 gbazin Exp $ * * Authors: Samuel Hocevar * Christophe Massiot @@ -285,6 +285,10 @@ uint32_t CPUCapabilities( void ) i_capabilities |= CPU_CAPABILITY_FPU; return i_capabilities; +#elif defined( _MSC_VER ) + i_capabilities |= CPU_CAPABILITY_FPU; + return i_capabilities; + #else /* default behaviour */ return i_capabilities; diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c index 4534a1d64d..4dabfed172 100644 --- a/src/stream_output/announce.c +++ b/src/stream_output/announce.c @@ -84,9 +84,10 @@ sap_session_t * sout_SAPNew ( sout_instance_t *p_sout , char * psz_url_arg , cha addr.sin_addr.s_addr = inet_addr(SAP_ADDR); addr.sin_port = htons( SAP_PORT ); - setsockopt( p_new->socket, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl) ); + setsockopt( p_new->socket, IPPROTO_IP, IP_MULTICAST_TTL, + (void*)&ttl, sizeof(ttl) ); - p_new->addr=(struct sockaddr_in)addr; + p_new->addr = addr; return(p_new); }