[Libreoffice-commits] core.git: 2 commits - avmedia/source

[Minh Ngo]

 avmedia/source/vlc/vlcmanager.cxx           |   11 ++++++++---
 avmedia/source/vlc/vlcplayer.hxx            |    4 +++-
 avmedia/source/vlc/wrapper/SymbolLoader.hxx |    5 ++---
 3 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 1e4ee9d1744a34c5ee3a21358fa3beef55f84246
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Wed Sep 4 14:57:14 2013 +0300

    Turn off event queue.
    
    It's not already threadsafe
    
    Change-Id: I0d201509017176bbbb2abd777304b6f30029d995

diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index 441dbc1..56e4365 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -43,8 +43,10 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr )
         }
     }
 
-    if (m_is_vlc_found)
-        mEventHandler->launch();
+    std::cout << "T" << std::endl;
+    //if (m_is_vlc_found)
+    //    mEventHandler->launch();
+    std::cout << "T" << std::endl;
 }
 
 Manager::~Manager()
@@ -62,6 +64,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUSt
         VLCPlayer* pPlayer( new VLCPlayer( rURL, mEventHandler /*, mxMgr */ ) );
         mPlayer = uno::Reference< media::XPlayer >( pPlayer );
     }
+        std::cout << "A" << std::endl;
 
     return mPlayer;
 }
commit 9335f5f1c577b8f6b43200de573f0112f84b007e
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Wed Sep 4 13:40:49 2013 +0300

    Fixing a crash when loading symbols from LibVLC.
    
    Change-Id: Ifb39dea6f0d2328d5658f34ca35d6d65445c38ef

diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index a028d74..441dbc1 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -30,9 +30,11 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr )
         //Check VLC version
         std::vector<std::string> verComponents;
         const std::string str(Common::Version());
+
+        std::cout << str << std::endl;
         boost::split(verComponents,
                      str,
-                     boost::is_any_of(".-"));
+                     boost::is_any_of(". "));
         if (verComponents.size() < 3
             || boost::lexical_cast<int>(verComponents[0]) < 2
             || (boost::lexical_cast<int>(verComponents[1]) == 0 && boost::lexical_cast<int>(verComponents[2]) < 8))
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index de809f7..2996cb2 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -19,7 +19,9 @@
 
 #ifndef _VLCPLAYER_HXX
 #define _VLCPLAYER_HXX
-
+#if defined UNX
+#include <unistd.h>
+#endif
 #include "vlccommon.hxx"
 #include <boost/shared_ptr.hpp>
 #include <cppuhelper/compbase2.hxx>
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index 3f97fa5..a49e4bf 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -74,8 +74,8 @@ namespace
                 *pMap[ i ].refValue = NULL;
                 return false;
             }
-
-            *pMap[ i ].refValue = aMethod;
+            else
+                *pMap[ i ].refValue = aMethod;
         }
 
         return true;
@@ -104,7 +104,6 @@ namespace VLC
 
         if (tryLink( aModule, pMap ))
         {
-            osl_unloadModule( aModule );
             return true;
         }