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

[Minh Ngo]

 avmedia/source/vlc/vlcmanager.cxx           |    8 +++-----
 avmedia/source/vlc/wrapper/SymbolLoader.hxx |    2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit bd8f84ceb36954496fd9f053436b0c4a8a5c38db
Author: Minh Ngo <nlmin...@gmail.com>
Date:   Sun Sep 15 23:13:19 2013 +0300

    Avmedia/VLC: Falling back to gstreamer if libvlc is not found.
    
    Change-Id: I8d4e3cded0fc8c26a27505b5d51806bbcdeecc93

diff --git a/avmedia/source/vlc/vlcmanager.cxx 
b/avmedia/source/vlc/vlcmanager.cxx
index e99416d..085f3c8 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -9,6 +9,7 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
+#include <com/sun/star/uno/Exception.hpp>
 #include "vlcmanager.hxx"
 #include "vlcplayer.hxx"
 #include "wrapper/Instance.hxx"
@@ -78,7 +79,7 @@ uno::Reference< media::XPlayer > SAL_CALL 
Manager::createPlayer( const rtl::OUSt
     throw (uno::RuntimeException)
 {
     if ( !m_is_vlc_found )
-        return uno::Reference< media::XPlayer >();
+        throw uno::Exception();
 
     if ( !rURL.isEmpty() )
     {
@@ -107,15 +108,12 @@ rtl::OUString SAL_CALL Manager::getImplementationName()
 sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName )
     throw (uno::RuntimeException)
 {
-    return serviceName == VLC_SERVICENAME && m_is_vlc_found;
+    return serviceName == VLC_SERVICENAME;
 }
 
 uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames()
     throw (uno::RuntimeException)
 {
-    if ( !m_is_vlc_found )
-        return uno::Sequence< rtl::OUString >();
-
     ::uno::Sequence< OUString > aRet(1);
     aRet[0] = VLC_SERVICENAME;
     return aRet;
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx 
b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index b463e75..50f1af4 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -36,7 +36,7 @@ struct ApiMap
 namespace
 {
 #if defined( UNX )
-    const char LibName[] = "libvlc.so.5";
+    const char LibName[] = "libvlc.so";
 #elif defined( MACOSX )
     const char LibName[] = 
"/Applications/VLC.app/Contents/MacOS/lib/libvlc.dylib";
 #elif defined( WNT )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits