Commit 12f8c376 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Detect the spu presence in the IM. Deactivate the teletext until any

good detection exist.
parent dab72b3b
...@@ -61,6 +61,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) : ...@@ -61,6 +61,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
{ {
i_old_playing_status = END_S; i_old_playing_status = END_S;
b_had_audio = b_had_video = b_has_audio = b_has_video = false; b_had_audio = b_had_video = b_has_audio = b_has_video = false;
b_has_subs = false;
old_name = ""; old_name = "";
artUrl = ""; artUrl = "";
p_input = NULL; p_input = NULL;
...@@ -312,13 +313,14 @@ void InputManager::UpdateTracks() ...@@ -312,13 +313,14 @@ void InputManager::UpdateTracks()
b_has_audio = val.i_int > 0; b_has_audio = val.i_int > 0;
var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &val, NULL ); var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
b_has_video = val.i_int > 0; b_has_video = val.i_int > 0;
var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
msg_Dbg( p_input, "I have audio-video: %i %i", b_has_audio, b_has_video ); b_has_subs = val.i_int > 0;
/* Update ZVBI status */ /* Update ZVBI status */
#ifdef ZVBI_COMPILED #ifdef ZVBI_COMPILED
/* Update teletext status*/ /* Update teletext status*/
emit teletextEnabled( true );/* FIXME */ if( b_has_subs )
emit teletextEnabled( false );/* FIXME */
#endif #endif
} }
......
...@@ -64,7 +64,7 @@ public: ...@@ -64,7 +64,7 @@ public:
bool hasInput() { return p_input && !p_input->b_dead && !p_input->b_die; } bool hasInput() { return p_input && !p_input->b_dead && !p_input->b_die; }
bool hasAudio() { return b_has_audio; } bool hasAudio() { return b_has_audio; }
bool hasVideo() { return b_has_video; } bool hasVideo() { return b_has_video; }
bool b_has_audio, b_has_video, b_had_audio, b_had_video; bool b_has_audio, b_has_video, b_had_audio, b_had_video, b_has_subs;
private: private:
intf_thread_t *p_intf; intf_thread_t *p_intf;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment