[vlc-commits] dshow: Cleanup

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Dec  6 16:21:26 2016 +0100| [c6400287b7d447cce703ddd2edba21770afa991d] | committer: Hugo Beauzée-Luyssen

dshow: Cleanup

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c6400287b7d447cce703ddd2edba21770afa991d
---

 modules/access/dshow/access.h     | 9 +++------
 modules/access/dshow/crossbar.cpp | 6 +++---
 modules/access/dshow/dshow.cpp    | 4 ++--
 modules/access/dshow/filter.h     | 5 ++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/modules/access/dshow/access.h b/modules/access/dshow/access.h
index da6ee85..97288cb 100644
--- a/modules/access/dshow/access.h
+++ b/modules/access/dshow/access.h
@@ -33,22 +33,19 @@
 #include <wrl/client.h>
 using Microsoft::WRL::ComPtr;
 
-typedef struct dshow_stream_t dshow_stream_t;
-
 /****************************************************************************
  * Crossbar stuff
  ****************************************************************************/
 #define MAX_CROSSBAR_DEPTH 10
 
-typedef struct CrossbarRouteRec
+struct CrossbarRoute
 {
     ComPtr<IAMCrossbar> pXbar;
     LONG        VideoInputIndex;
     LONG        VideoOutputIndex;
     LONG        AudioInputIndex;
     LONG        AudioOutputIndex;
-
-} CrossbarRoute;
+};
 
 void DeleteCrossbarRoutes( access_sys_t * );
 HRESULT FindCrossbarRoutes( vlc_object_t *, access_sys_t *,
@@ -71,7 +68,7 @@ struct access_sys_t
     CrossbarRoute           crossbar_routes[MAX_CROSSBAR_DEPTH];
 
     /* list of elementary streams */
-    std::vector<dshow_stream_t*> pp_streams;
+    std::vector<struct dshow_stream_t*> pp_streams;
     int            i_current_stream;
 
     /* misc properties */
diff --git a/modules/access/dshow/crossbar.cpp b/modules/access/dshow/crossbar.cpp
index fc3a0b5..75e9318 100644
--- a/modules/access/dshow/crossbar.cpp
+++ b/modules/access/dshow/crossbar.cpp
@@ -226,11 +226,11 @@ HRESULT FindCrossbarRoutes( vlc_object_t *p_this, access_sys_t *p_sys,
             {
                 // remember connector type
                 physicalType = inputPinPhysicalType;
- 
+
                 msg_Dbg( p_this, "found existing route for output %ld (type %s) to input %ld (type %s)",
                          outputPinIndex, GetPhysicalPinName( outputPinPhysicalType ),
                          inputPinIndex, GetPhysicalPinName( inputPinPhysicalType ) );
- 
+
                 // fall through to for loop, note 'inputPinIndex' is set to the pin we are looking for
                 // hence, loop iteration should not wind back
 
@@ -241,7 +241,7 @@ HRESULT FindCrossbarRoutes( vlc_object_t *p_this, access_sys_t *p_sys,
             inputPinIndex = 0;
         }
     }
- 
+
     //
     // for all input pins
     //
diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index ebaf12e..6204862 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -303,7 +303,7 @@ vlc_module_end ()
 /*****************************************************************************
  * DirectShow elementary stream descriptor
  *****************************************************************************/
-typedef struct dshow_stream_t
+struct dshow_stream_t
 {
     std::string           devicename;
     ComPtr<IBaseFilter>   p_device_filter;
@@ -323,7 +323,7 @@ typedef struct dshow_stream_t
     bool      b_pts;
 
     std::deque<VLCMediaSample> samples_queue;
-} dshow_stream_t;
+};
 
 /*****************************************************************************
  * DirectShow utility functions
diff --git a/modules/access/dshow/filter.h b/modules/access/dshow/filter.h
index 65030cc..d867636 100644
--- a/modules/access/dshow/filter.h
+++ b/modules/access/dshow/filter.h
@@ -28,12 +28,11 @@
 
 #include <deque>
 
-typedef struct VLCMediaSample
+struct VLCMediaSample
 {
     ComPtr<IMediaSample> p_sample;
     mtime_t i_timestamp;
-
-} VLCMediaSample;
+};
 
 /* */
 void WINAPI FreeMediaType( AM_MEDIA_TYPE& mt );