[MPlayer-cvslog] r30121 - trunk/command.c

[reimar]

Author: reimar
Date: Sun Dec 27 15:06:47 2009
New Revision: 30121

Log:
Use the same condition to decide if the audio/video id property is
not available for all commands (get, set and print).

Modified:
   trunk/command.c

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Sun Dec 27 15:02:20 2009	(r30120)
+++ trunk/command.c	Sun Dec 27 15:06:47 2009	(r30121)
@@ -796,18 +796,16 @@ static int mp_property_audio(m_option_t 
 			     MPContext * mpctx)
 {
     int current_id = -1, tmp;
+    if (!mpctx->demuxer || !mpctx->demuxer->audio)
+        return M_PROPERTY_UNAVAILABLE;
 
     switch (action) {
     case M_PROPERTY_GET:
-	if (!mpctx->sh_audio)
-	    return M_PROPERTY_UNAVAILABLE;
 	if (!arg)
 	    return M_PROPERTY_ERROR;
 	*(int *) arg = audio_id;
 	return M_PROPERTY_OK;
     case M_PROPERTY_PRINT:
-	if (!mpctx->sh_audio)
-	    return M_PROPERTY_UNAVAILABLE;
 	if (!arg)
 	    return M_PROPERTY_ERROR;
 
@@ -840,8 +838,6 @@ static int mp_property_audio(m_option_t 
 
     case M_PROPERTY_STEP_UP:
     case M_PROPERTY_SET:
-	if (!mpctx->demuxer || !mpctx->demuxer->audio)
-	    return M_PROPERTY_UNAVAILABLE;
 	if (action == M_PROPERTY_SET && arg)
 	    tmp = *((int *) arg);
 	else
@@ -874,18 +870,16 @@ static int mp_property_video(m_option_t 
 			     MPContext * mpctx)
 {
     int current_id = -1, tmp;
+    if (!mpctx->demuxer || !mpctx->demuxer->video)
+        return M_PROPERTY_UNAVAILABLE;
 
     switch (action) {
     case M_PROPERTY_GET:
-	if (!mpctx->sh_video)
-	    return M_PROPERTY_UNAVAILABLE;
 	if (!arg)
 	    return M_PROPERTY_ERROR;
 	*(int *) arg = video_id;
 	return M_PROPERTY_OK;
     case M_PROPERTY_PRINT:
-	if (!mpctx->sh_video)
-	    return M_PROPERTY_UNAVAILABLE;
 	if (!arg)
 	    return M_PROPERTY_ERROR;
 
@@ -900,8 +894,6 @@ static int mp_property_video(m_option_t 
 
     case M_PROPERTY_STEP_UP:
     case M_PROPERTY_SET:
-	if (!mpctx->demuxer || !mpctx->demuxer->video)
-	    return M_PROPERTY_UNAVAILABLE;
 	if (action == M_PROPERTY_SET && arg)
 	    tmp = *((int *) arg);
 	else