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

[Minh Ngo]

 avmedia/source/viewer/mediawindow_impl.cxx  |    2 +-
 avmedia/source/vlc/vlcframegrabber.cxx      |    2 +-
 avmedia/source/vlc/vlcmanager.cxx           |    2 +-
 avmedia/source/vlc/wrapper/SymbolLoader.hxx |    3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit ba0d1fc481c524bb87c9a9e0f434d43927428f75
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Mon Sep 23 21:55:02 2013 +0300

    Avmedia/VLC: Adding more debug info
    
    Change-Id: I484050575da7e09e89a10f3a4e8d5fbe95f88044

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 062710c..adfe1cd 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
+#include <iostream>
 #include "mediawindow_impl.hxx"
 #include "mediaevent_impl.hxx"
 #include "mediamisc.hxx"
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 8b348f4..f5b7091 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -30,7 +30,7 @@ namespace
         "-Vdummy",
         "--snapshot-format=png",
         "--ffmpeg-threads",
-        "--verbose=-1",
+        "--verbose=2",
         "--no-audio"
     };
 }
diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index 085f3c8..e86302d 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -30,7 +30,7 @@ namespace
 
     const char * const VLC_ARGS[] = {
         "-Vdummy",
-        "--verbose=-1"
+        "--verbose=2"
     };
 }
 
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index 6bda7bd..7d89339 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -47,7 +47,7 @@ namespace
         wchar_t arCurrent[MAX_PATH];
         DWORD dwType, dwCurrentSize = sizeof( arCurrent );
 
-        if ( ::RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\VideoLAN\\VLC",
+        if ( ::RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\VideoLAN\\VLC",
                              0, KEY_READ, &hKey ) == ERROR_SUCCESS )
         {
             if ( ::RegQueryValueExW( hKey, L"InstallDir", NULL, &dwType, (LPBYTE) arCurrent, &dwCurrentSize ) == ERROR_SUCCESS &&
@@ -95,6 +95,7 @@ namespace
 #elif defined( WNT )
         const OUString& fullPath = GetVLCPath() + OUString::createFromAscii(LibName);
 #endif
+        SAL_INFO("avmedia", fullPath);
 
         oslModule aModule = osl_loadModule( fullPath.pData,
                                             SAL_LOADMODULE_DEFAULT );