Mercurial > mplayer.hg

changeset 34076:6a0bda5e63ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author ib
date Fri, 30 Sep 2011 15:13:01 +0000
parents b9cab6c0992c
children deff81b57903
files gui/interface.h mplayer.c
diffstat 2 files changed, 1 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.h	Fri Sep 30 14:38:56 2011 +0000
+++ b/gui/interface.h	Fri Sep 30 15:13:01 2011 +0000
@@ -98,7 +98,7 @@
     int VideoWidth;
     int VideoHeight;
 
-    int StreamType;           // public, read access by MPlayer
+    int StreamType;
     int AudioChannels;
 
 #ifdef CONFIG_DVDREAD
--- a/mplayer.c	Fri Sep 30 14:38:56 2011 +0000
+++ b/mplayer.c	Fri Sep 30 15:13:01 2011 +0000
@@ -3053,25 +3053,6 @@
             }
         }
         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 */