Changeset 8aa24cfe361b893a626016211e05f41c544f5c1b

Timestamp:

05/22/03 14:00:57 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1053604857 +0000

git-parent:

[ac121d997285ab4a36ad1c88941d9a191c9a2275]

git-author:

Gildas Bazin <gbazin@videolan.org> 1053604857 +0000

Message:

* 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.

Files:

• INSTALL.win32 (modified) (2 diffs)
• modules/access/cdda.c (modified) (2 diffs)
• modules/access/vcd/cdrom.c (modified) (2 diffs)
• modules/access/vcd/vcd.c (modified) (2 diffs)
• modules/gui/wxwindows/interface.cpp (modified) (2 diffs)
• modules/gui/wxwindows/streamout.cpp (modified) (7 diffs)
• src/misc/cpu.c (modified) (2 diffs)
• src/stream_output/announce.c (modified) (1 diff)

INSTALL.win32

@@ -1 @@
-4 2003/05/17 23:57:35
+5 2003/05/22 12:00:56
-
-INSTALL file for the Windows9x/Me/NT4/2k/XP version of the VLC media player
@@ -46 +46 @@
-  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.

modules/access/cdda.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000 VideoLAN
-3 2003/05/19 20:47:1
+4 2003/05/22 12:00:5
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -118 +118 @@
-    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 );

modules/access/vcd/cdrom.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-1 2003/05/18 15:44:03
+2 2003/05/22 12:00:57
- *
- * Authors: Johan Bilien <jobi@via.ecp.fr>
@@ -102 +102 @@
-     */
-#ifdef WIN32
-
-
+
-    {
-        b_is_file = 0;

modules/access/vcd/vcd.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000 VideoLAN
-1 2003/05/18 15:44:03
+2 2003/05/22 12:00:57
- *
- * Author: Johan Bilien <jobi@via.ecp.fr>
@@ -104 +104 @@
-    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 );

modules/gui/wxwindows/interface.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-1 2003/05/20 23:17:59
+2 2003/05/22 12:00:56
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -846 +846 @@
-    for( size_t i = 0; i < filenames.GetCount(); i++ )
-        playlist_Add( p_playlist, (const char *)filenames[i].mb_str(),
-i ? 0 : PLAYLIST_GO
+(i ? 0 : PLAYLIST_GO)
-
-    vlc_object_release( p_playlist );

modules/gui/wxwindows/streamout.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-3 2003/05/20 23:17:59
+4 2003/05/22 12:00:56
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -169 +169 @@
-    wxStaticText *mrl_label = new wxStaticText( panel, -1,
-                                                wxU(_("Destination Target:")));
-mrl
+wxT("")
-                                wxPoint(20,25), wxSize(120, -1), 0, NULL );
-    mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
@@ -216 +216 @@
-    main_sizer->Layout();
-    SetSizerAndFit( main_sizer );
-
-    /* Update all the values */
-    //ParseMRL();
-}
-
@@ -321 +318 @@
-
-    if( !transcode.IsEmpty() || !duplicate.IsEmpty() )
- = wxT("#") + transcode + duplicate
+_combo->SetValue( wxT("#") + transcode + duplicate )
-    else
-
-
-
+
-}
-
@@ -584 +579 @@
-}
-
-#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.
@@ -674 +584 @@
-void SoutDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
-{
+    mrl_combo->Append( mrl_combo->GetValue() );
+    mrl = mrl_combo->GetValue();
-    EndModal( wxID_OK );
-}
@@ -684 +596 @@
-void SoutDialog::OnMRLChange( wxCommandEvent& event )
-{
-
+//
-}
-

src/misc/cpu.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-0 2002/12/06 16:34:08 sam
+1 2003/05/22 12:00:57 gbazin
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -286 +286 @@
-    return i_capabilities;
-
+#elif defined( _MSC_VER )
+    i_capabilities |= CPU_CAPABILITY_FPU;
+    return i_capabilities;
+
-#else
-    /* default behaviour */

src/stream_output/announce.c

@@ -85 +85 @@
-        addr.sin_port        = htons( SAP_PORT );
-    
-
+
+
-     
-=(struct sockaddr_in)
+ = 
-    
-        return(p_new);