summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-15 08:30:43 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-15 08:30:43 +0000
commit699e0cc67bf6a91419df945eb17015f95edcf2d2 (patch)
treed822178472e2eb62902980ccd3121559a527d57d /mplayer.c
parenta96150da8513c4536e3be1b9cc75c565bd482021 (diff)
downloadmpv-699e0cc67bf6a91419df945eb17015f95edcf2d2.tar.bz2
mpv-699e0cc67bf6a91419df945eb17015f95edcf2d2.tar.xz
loadfile/loadlist can now also add files to the playlist
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16228 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index e1c6a119eb..ccb3330ad2 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2998,6 +2998,9 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
play_tree_t* e = play_tree_new();
play_tree_add_file(e,cmd->args[0].v.s);
+ if (cmd->args[1].v.i) // append
+ play_tree_append_entry(playtree, e);
+ else {
// Go back to the start point
while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END)
/* NOP */;
@@ -3005,6 +3008,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
play_tree_set_child(playtree,e);
play_tree_iter_step(playtree_iter,0,0);
eof = PT_NEXT_SRC;
+ }
brk_cmd = 1;
} break;
case MP_CMD_LOADLIST : {
@@ -3012,6 +3016,9 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
if(!e)
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_PlaylistLoadUnable,cmd->args[0].v.s);
else {
+ if (cmd->args[1].v.i) // append
+ play_tree_append_entry(playtree, e);
+ else {
// Go back to the start point
while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END)
/* NOP */;
@@ -3019,6 +3026,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
play_tree_set_child(playtree,e);
play_tree_iter_step(playtree_iter,0,0);
eof = PT_NEXT_SRC;
+ }
}
brk_cmd = 1;
} break;