Changeset b73f6722b19f7e553f7516d7533eeed6074b6ea3

Timestamp:

06/02/02 13:59:46 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1023019186 +0000

git-parent:

[1de74b8731b3bfbd0c76eb67a7e4348a1fa3087c]

git-author:

Sam Hocevar <sam@videolan.org> 1023019186 +0000

Message:

(new in MAIN)

• ./src/playlist/playlist.c, src/input/input.c: added safety checks to
  prevent crashes on next file.
  

(ported from 0_4_1_branch)

• ./plugins/gtk/gtk_display.c, ./plugins/win32/mainframe.cpp: we deactivate
  popup menus when no stream is being played, even in network mode.
  
• ./src/input/mpeg_system.c: removed unnecessarily verbose message.
  

Files:

• ChangeLog (modified) (2 diffs)
• include/input_ext-intf.h (modified) (3 diffs)
• plugins/gtk/gtk_display.c (modified) (2 diffs)
• plugins/win32/mainframe.cpp (modified) (1 diff)
• src/input/input.c (modified) (12 diffs)
• src/input/mpeg_system.c (modified) (2 diffs)
• src/playlist/playlist.c (modified) (6 diffs)

ChangeLog

@@ -5 +5 @@
-HEAD
-
+  * ./src/playlist/playlist.c, src/input/input.c: added safety checks to
+    prevent crashes on next file.
-  * ./src/misc/objects.c: commented all functions.
-  * ./src/misc/objects.c: implemented vlc_object_find( , , FIND_ANYWHERE).
@@ -31 +33 @@
-
-0.4.1
-
+
+
+
+
+
-  * ./src/video_output/video_output.c: fixed the "picture has invalid status"
-    bug which might have been the cause of crashes.

include/input_ext-intf.h

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-8 2002/06/01 18:04:48
+9 2002/06/02 11:59:46
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -248 +248 @@
-    VLC_COMMON_MEMBERS
-
-and locks 
+
-    vlc_bool_t              b_eof;
-    int                     i_status;                         /* status flag */
-
-    /* Access module */
@@ -329 +328 @@
-input_thread_t * __input_CreateThread ( vlc_object_t *,
-                                        playlist_item_t *, int * );
-, int *pi_status
+
-void   input_DestroyThread  ( input_thread_t * );
-

plugins/gtk/gtk_display.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-4 2002/06/02 09:03:54
+5 2002/06/02 11:59:46
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -202 +202 @@
-            gtk_label_set_text( GTK_LABEL( p_label ), "" );
-            gtk_widget_show( GTK_WIDGET( p_file_box ) );
-
-
-    gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_program"),
-            FALSE );
-gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_title"),
-    gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_chapter"),
-                              FALSE );
-gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_audio"),
-    gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_subpictures"),
-                              FALSE );
-gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_navigation"),
-                              FALSE );
-gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_audio"),
-    gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_subpictures"),
-                              FALSE );
-}
+
+
+/* unsensitize menus */
+gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_program"),
+                     
+gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_title"), FALSE );
+gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_chapter"),
+                     
+gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_audio"), FALSE );
+gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_subpictures"),
+                      FALSE );
+gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_navigation"),
+                     
+gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_audio"), FALSE );
+gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_subpictures"),
+                          FALSE );
-    }
-

plugins/win32/mainframe.cpp

@@ -668 +668 @@
-             * nothing is displayed; isn't it nicer ? :) */ 
-            i_Height += 17;
-
-            /* unsensitize menus */
-            MenuProgram->Enabled = false;
-            MenuTitle->Enabled = false;
-            MenuChapter->Enabled = false;
-            MenuAudio->Enabled = false;
-            MenuSubtitles->Enabled = false;
-            PopupNavigation->Enabled = false;
-            PopupAudio->Enabled = false;
-            PopupSubtitles->Enabled = false;
-        }
+
+        /* unsensitize menus */
+        MenuProgram->Enabled = false;
+        MenuTitle->Enabled = false;
+        MenuChapter->Enabled = false;
+        MenuAudio->Enabled = false;
+        MenuSubtitles->Enabled = false;
+        PopupNavigation->Enabled = false;
+        PopupAudio->Enabled = false;
+        PopupSubtitles->Enabled = false;
-    }
-

src/input/input.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-199 2002/06/01 18:04:49
+200 2002/06/02 11:59:46
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -58 +58 @@
-static void ErrorThread     ( input_thread_t *p_input );
-static void CloseThread     ( input_thread_t *p_input );
-static void DestroyThread   ( input_thread_t *p_input );
-static void EndThread       ( input_thread_t *p_input );
-
@@ -87 +86 @@
-    /* Set target */
-    p_input->psz_source = strdup( p_item->psz_name );
-
-    /* Set status */
-    p_input->i_status   = THREAD_CREATE;
-
-    /* Demux */
@@ -157 +153 @@
-    vlc_object_attach( p_input, p_parent );
-
-
+ and wait for its readiness
-    if( vlc_thread_create( p_input, "input", RunThread, 1 ) )
-    {
@@ -165 +161 @@
-    }
-
-#if 0
-    /* If status is NULL, wait until the thread is created */
-    if( pi_status == NULL )
-    {
-        do
-        {
-            msleep( THREAD_SLEEP );
-        } while( (i_status != THREAD_READY) && (i_status != THREAD_ERROR)
-                && (i_status != THREAD_FATAL) );
-    }
-#endif
-
-    return p_input;
-}
@@ -185 +169 @@
- * This function should not return until the thread is effectively cancelled.
- *****************************************************************************/
-, int *pi_status
+
-{
-    /* Make the thread exit from a possible vlc_cond_wait() */
@@ -194 +178 @@
-    vlc_cond_signal( &p_input->stream.stream_wait );
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-
-    /* If status is NULL, wait until thread has been destroyed */
-#if 0
-    if( pi_status == NULL )
-    {
-        do
-        {
-            msleep( THREAD_SLEEP );
-        } while ( (i_status != THREAD_OVER) && (i_status != THREAD_ERROR)
-                  && (i_status != THREAD_FATAL) );
-    }
-#endif
-}
-
@@ -222 +194 @@
-    vlc_cond_destroy( &p_input->stream.stream_wait );
-    vlc_mutex_destroy( &p_input->stream.stream_lock );
-    
-    /* Free input structure */
-    free( p_input );
-}
-
@@ -237 +206 @@
-    {
-        /* If we failed, wait before we are killed, and exit */
-        p_input->i_status = THREAD_ERROR;
-        p_input->b_error = 1;
-        vlc_thread_ready( p_input );
-        ErrorThread( p_input );
-        DestroyThread( p_input );
-        return 0;
-    }
-
-    vlc_thread_ready( p_input );
-
-    p_input->i_status = THREAD_READY;
-
-    /* initialization is complete */
@@ -393 +358 @@
-
-    EndThread( p_input );
-
-    DestroyThread( p_input );
-
-    return 0;
@@ -584 +547 @@
-    input_DumpStream( p_input );
-
-Store status
-i_status = THREAD_END
+Tell we're dead
+b_dead = 1
-
-    /* Free all ES and destroy all decoder threads */
@@ -611 +574 @@
-}
-
-/*****************************************************************************
- * DestroyThread: destroy the input thread
- *****************************************************************************/
-static void DestroyThread( input_thread_t * p_input )
-{
-    /* Update status */
-    p_input->i_status = THREAD_OVER;
-}
-

src/input/mpeg_system.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-8 2002/06/01 12:32:01
+9 2002/06/02 11:59:46
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -1227 +1227 @@
-                 * (except PCR that have already been handled), we can trash
-                 * the packet. */
-                msg_Warn( p_input,
-                          "packet without payload received by TS demux" );
-                b_trash = 1;
-            }

src/playlist/playlist.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-3 2002/06/02 09:03:54
+4 2002/06/02 11:59:46
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -159 +159 @@
- * playlist_Command: do a playlist action
- *****************************************************************************
-Delete the item in the playlist with position i_pos.
+
- *****************************************************************************/
-void playlist_Command( playlist_t * p_playlist, int i_command, int i_arg )
@@ -200 +200 @@
-        if( p_playlist->p_input )
-        {
-i_status == THREAD_OVER
+b_dead
-            {
-                input_thread_t *p_input;
@@ -214 +214 @@
-                vlc_object_release( p_input );
-                input_DestroyThread( p_input );
-
-
-
-
-
-
-
+
+
+
+
+
+
-            }
-        }
@@ -258 +257 @@
-    while( p_playlist->p_input )
-    {
-i_status == THREAD_OVER
+b_dead
-        {
-            input_thread_t *p_input;
@@ -272 +271 @@
-            vlc_object_release( p_input );
-            input_DestroyThread( p_input );
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-        else