[vlc-commits] Remove use of toggleTeletext

[Hugo Beauzée-Luyssen]

npapi-vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Mar 23 10:30:06 2017 +0100| [8c333506d9262186b3cfb3b652b0e5be227d808b] | committer: Hugo Beauzée-Luyssen

Remove use of toggleTeletext

> https://code.videolan.org/videolan/npapi-vlc/commit/8c333506d9262186b3cfb3b652b0e5be227d808b
---

 activex/vlccontrol2.cpp       | 5 ++++-
 npapi/npruntime/npolibvlc.cpp | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/activex/vlccontrol2.cpp b/activex/vlccontrol2.cpp
index 6e50ce2..6430d15 100644
--- a/activex/vlccontrol2.cpp
+++ b/activex/vlccontrol2.cpp
@@ -1272,7 +1272,10 @@ STDMETHODIMP VLCVideo::toggleFullscreen()
 
 STDMETHODIMP VLCVideo::toggleTeletext()
 {
-    _plug->get_player().get_mp().toggleTeletext();
+    if( _plug->get_player().get_mp().teletext() == -1 )
+        _plug->get_player().get_mp().setTeletext( 100 );
+    else
+        _plug->get_player().get_mp().setTeletext( -1 );
     return S_OK;
 }
 
diff --git a/npapi/npruntime/npolibvlc.cpp b/npapi/npruntime/npolibvlc.cpp
index e2da795..d1eb027 100644
--- a/npapi/npruntime/npolibvlc.cpp
+++ b/npapi/npruntime/npolibvlc.cpp
@@ -1545,7 +1545,10 @@ LibvlcVideoNPObject::invoke(int index, const NPVariant *,
             {
                 if( argCount == 0 )
                 {
-                    p_plugin->getMD().toggleTeletext();
+                    if ( p_plugin->getMD().teletext() == -1 )
+                        p_plugin->getMD().setTeletext( 100 );
+                    else
+                        p_plugin->getMD().setTeletext( -1 );
                     return INVOKERESULT_NO_ERROR;
                 }
                 return INVOKERESULT_NO_SUCH_METHOD;