For consistency, remove references to vlc from libvlc

[vlc] / modules / access / dshow / dshow.cpp

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index e25372c20a5da929d7cabb870bce121a14019d07..46f01b7ddee429b496726d0f52eb0a78e6c511b6 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -32,6 +32,7 @@
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 #include <vlc/vout.h>
+#include <vlc_interaction.h>
 
 #include "common.h"
 #include "filter.h"
@@ -890,6 +891,9 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
     {
         msg_Err( p_this, "can't use device: %s, unsupported device type",
                  devicename.c_str() );
+        intf_UserFatal( p_this, VLC_FALSE, _("Capturing failed"), 
+                        _("VLC cannot use the device \"%s\", because its device "
+                          "type is not supported.") );
         return VLC_EGENERIC;
     }
 
@@ -937,6 +941,9 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
     else {
         /* capture device */
         msg_Err( p_this, "capture device '%s' does not support required parameters !", devicename.c_str() );
+        intf_UserFatal( p_this, VLC_FALSE, _("Capturing failed"), 
+                        _("The capture device \"%s\" does not support the "
+                          "required parameters."), devicename.c_str() );
         p_device_filter->Release();
         return VLC_EGENERIC;
     }
@@ -1607,7 +1614,7 @@ static block_t *ReadCompressed( access_t *p_access )
         }
 
         sample.p_sample->GetPointer( &p_data );
-        p_access->p_vlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
+        p_access->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
         sample.p_sample->Release();
 
         /* The caller got what he wanted */
@@ -1696,7 +1703,7 @@ static int Demux( demux_t *p_demux )
 #endif
 
     p_block = block_New( p_demux, i_data_size );
-    p_demux->p_vlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
+    p_demux->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
     p_block->i_pts = p_block->i_dts = i_pts;
     sample.p_sample->Release();
 
@@ -1892,6 +1899,7 @@ static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name,
     if( p_device_filter )
     {
         ShowPropertyPage( p_device_filter );
+        p_device_filter->Release();
     }
     else
     {