Use standard ASCII for ^H, ^I, ^M and escape

[vlc] / bindings / libvlcpp / src / media.cpp

diff --git a/bindings/libvlcpp/src/media.cpp b/bindings/libvlcpp/src/media.cpp
index 4c65ddf9fbcb29ed24b78d27b4dcd0b0b1cecbee..9e166528b6839cb41802d14196da006ecc565608 100644 (file)
--- a/bindings/libvlcpp/src/media.cpp
+++ b/bindings/libvlcpp/src/media.cpp
@@ -28,8 +28,9 @@ using namespace libvlc;
 
 Media::Media( libVLC &libvlcInstance, const char *psz_mrl )
 {
-    Exception ex;
-    m_media = libvlc_media_new( libvlcInstance.instance(), psz_mrl, &ex.ex );
+    m_media = libvlc_media_new( libvlcInstance.m_instance, psz_mrl );
+    if( !m_media )
+        throw libvlc_errmsg();
 }
 
 Media::Media( const Media& original )
@@ -54,8 +55,7 @@ void Media::addOption( const char *ppsz_options, libvlc_media_option_t flag )
 
 int64_t Media::duration()
 {
-    Exception ex;
-    return libvlc_media_get_duration( m_media, &ex.ex );
+    return libvlc_media_get_duration( m_media );
 }
 
 int Media::isPreparsed()
@@ -98,7 +98,3 @@ void *Media::userData()
     return libvlc_media_get_user_data( m_media );
 }
 
-libvlc_media_t *Media::instance()
-{
-    return m_media;
-}