From eb6179a168105811e7ed7e3ad6a0f7277fb2a503 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 17 Jun 2007 08:29:26 +0000
Subject: Merge (trivial) dvdnav and dvdread subtitle selection code

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23569 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 command.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'command.c')

diff --git a/command.c b/command.c
index 77a30c1ad8..dcf96df608 100644
--- a/command.c
+++ b/command.c
@@ -1243,17 +1243,6 @@ static int mp_property_sub(m_option_t * prop, int action, void *arg,
 	dvdsub_id =
 	    mpctx->global_sub_pos - mpctx->global_sub_indices[SUB_SOURCE_DEMUX];
 	if (d_sub) {
-#ifdef USE_DVDREAD
-	    if (vo_spudec && mpctx->stream->type == STREAMTYPE_DVD) {
-		d_sub->id = dvdsub_id;
-	    }
-#endif
-
-#ifdef USE_DVDNAV
-	    if (vo_spudec && mpctx->stream->type == STREAMTYPE_DVDNAV) {
-		d_sub->id = dvdsub_id;
-	    }
-#endif
 	    if (mpctx->stream->type != STREAMTYPE_DVD
 		&& mpctx->stream->type != STREAMTYPE_DVDNAV) {
 		int i = 0;
@@ -1268,6 +1257,8 @@ static int mp_property_sub(m_option_t * prop, int action, void *arg,
 		    }
 		}
 	    }
+	    else if (vo_spudec)
+		d_sub->id = dvdsub_id;
 	    if (mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA)
 		d_sub->id = demux_mkv_change_subs(mpctx->demuxer, dvdsub_id);
 	    if (d_sub->sh && d_sub->id >= 0) {
-- 
cgit v1.2.3