[MPlayer-cvslog] r34164 - in trunk: gui/interface.h mplayer.c

[ib]

Author: ib
Date: Fri Sep 30 17:13:01 2011
New Revision: 34164

Log:
Remove needless code.

A filename for a stream will be provided by the GUI the same way
as any other filename, so there is no need to get it all of a sudden
from a playtree_iter.

Modified:
   trunk/gui/interface.h
   trunk/mplayer.c

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Fri Sep 30 16:38:56 2011	(r34163)
+++ trunk/gui/interface.h	Fri Sep 30 17:13:01 2011	(r34164)
@@ -98,7 +98,7 @@ typedef struct {
     int VideoWidth;
     int VideoHeight;
 
-    int StreamType;           // public, read access by MPlayer
+    int StreamType;
     int AudioChannels;
 
 #ifdef CONFIG_DVDREAD

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Fri Sep 30 16:38:56 2011	(r34163)
+++ trunk/mplayer.c	Fri Sep 30 17:13:01 2011	(r34164)
@@ -3053,25 +3053,6 @@ play_next_file:
             }
         }
         gui(GUI_PREPARE, 0);
-        if (guiInfo.StreamType == STREAMTYPE_STREAM) {
-            play_tree_t *entry = play_tree_new();
-            play_tree_add_file(entry, guiInfo.Filename);
-            if (mpctx->playtree)
-                play_tree_free_list(mpctx->playtree->child, 1);
-            else
-                mpctx->playtree = play_tree_new();
-            play_tree_set_child(mpctx->playtree, entry);
-            if (mpctx->playtree) {
-                mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig);
-                if (mpctx->playtree_iter) {
-                    if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) {
-                        play_tree_iter_free(mpctx->playtree_iter);
-                        mpctx->playtree_iter = NULL;
-                    }
-                    filename = play_tree_iter_get_file(mpctx->playtree_iter, 1);
-                }
-            }
-        }
     }
 #endif /* CONFIG_GUI */