[vlc-commits] [Git][videolan/vlc][master] 6 commits: bdadefs.h: remove unused defines

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
efac653f by Steve Lhomme at 2025-03-09T12:45:56+00:00
bdadefs.h: remove unused defines

- - - - -
1e322661 by Steve Lhomme at 2025-03-09T12:45:56+00:00
bdadefs.h: move GUIDs in the only file using them

- - - - -
bc100cc1 by Steve Lhomme at 2025-03-09T12:45:56+00:00
bdadefs.h: include tuner.h where it's needed

It's not needed in bdadefs.h.

- - - - -
6a46b642 by Steve Lhomme at 2025-03-09T12:45:56+00:00
bdagraph: add CLSID_SampleGrabber declaration for older mingw-w64

It was added in 3f7b2417284ef7cda5d4f3e816370f518667bfc7 [^1] which is in
mingw-w64 v12.

[^1]: https://github.com/mingw-w64/mingw-w64/commit/3f7b2417284ef7cda5d4f3e816370f518667bfc7

- - - - -
adc6b5f2 by Steve Lhomme at 2025-03-09T12:45:56+00:00
bdagraph: use qedit.h in mingw-w64

qedit.h is gone from the Windows SDK since Windows 7 [^1].

> To obtain Qedit.h, download the Microsoft Windows SDK Update for Windows
> Vista and .NET Framework 3.0. Qedit.h is not available in the Microsoft Windows
> SDK for Windows 7 and .NET Framework 3.5 Service Pack 1.

[^1]: https://learn.microsoft.com/en-us/windows/win32/directshow/isamplegrabber

- - - - -
156459ca by Steve Lhomme at 2025-03-09T12:45:56+00:00
bdagraph: rename bdadefs.h to qedit.h

It defines the classes not available in the Windows SDK that used to be in qedit.h.

- - - - -


4 changed files:

- modules/access/Makefile.am
- modules/access/dtv/bdagraph.cpp
- modules/access/dtv/bdagraph.hpp
- modules/access/dtv/bdadefs.h → modules/access/dtv/qedit.h


Changes:

=====================================
modules/access/Makefile.am
=====================================
@@ -316,7 +316,7 @@ endif
 if HAVE_WIN32_DESKTOP
 # Work-around automake bug:
 # Use an import library for C++ to retain C linker on other platforms.
-libbda_la_SOURCES = access/dtv/bdadefs.h access/dtv/bdagraph.cpp access/dtv/bdagraph.hpp
+libbda_la_SOURCES = access/dtv/qedit.h access/dtv/bdagraph.cpp access/dtv/bdagraph.hpp
 libbda_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBCOMCXXFLAGS)
 libbda_la_LDFLAGS = -static
 libbda_la_LIBADD = -lstrmiids $(LIBCOM) -luuid


=====================================
modules/access/dtv/bdagraph.cpp
=====================================
@@ -40,6 +40,27 @@
 #include "dtv.h"
 #undef DEBUG_MONIKER_NAME
 
+#if defined(__MINGW64_VERSION_MAJOR)
+DEFINE_GUID(CLSID_DigitalCableNetworkType,
+    0x143827AB,0xF77B,0x498d,0x81,0xCA,0x5A,0x00,0x7A,0xEC,0x28,0xBF);
+
+/* KSCATEGORY_BDA */
+DEFINE_GUID(KSCATEGORY_BDA_TRANSPORT_INFORMATION,
+    0xa2e3074f,0x6c3d,0x11d3,0xb6,0x53,0x00,0xc0,0x4f,0x79,0x49,0x8e);
+DEFINE_GUID(KSCATEGORY_BDA_RECEIVER_COMPONENT,
+    0xFD0A5AF4,0xB41D,0x11d2,0x9c,0x95,0x00,0xc0,0x4f,0x79,0x71,0xe0);
+DEFINE_GUID(KSCATEGORY_BDA_NETWORK_TUNER,
+    0x71985f48,0x1ca1,0x11d3,0x9c,0xc8,0x00,0xc0,0x4f,0x79,0x71,0xe0);
+DEFINE_GUID(KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT,
+    0xF4AEB342,0x0329,0x4fdd,0xA8,0xFD,0x4A,0xFF,0x49,0x26,0xC9,0x78);
+
+#if __MINGW64_VERSION_MAJOR < 12
+extern "C" {
+    extern const CLSID CLSID_SampleGrabber; // found in strmiids
+};
+#endif
+#endif
+
 using Microsoft::WRL::ComPtr;
 
 static ModulationType dvb_parse_modulation (const char *mod)


=====================================
modules/access/dtv/bdagraph.hpp
=====================================
@@ -36,9 +36,15 @@
 #endif
 
 #include <dshow.h>
+#include <tuner.h>
 
 #include <comcat.h>
-#include "bdadefs.h"
+#if defined(__MINGW64_VERSION_MAJOR)
+#include <qedit.h>
+#else
+// qedit.h is not part of the Windows 7 SDK anymore, use a local version
+#include "qedit.h"
+#endif
 #include <stdexcept>
 
 #include <vlc_threads.h>


=====================================
modules/access/dtv/bdadefs.h → modules/access/dtv/qedit.h
=====================================
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * bdadefs.h : DirectShow BDA headers for vlc
+ * qedit.h : DirectShow BDA headers for vlc
  *****************************************************************************
  * Copyright (C) 2007 the VideoLAN team
  *
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <tuner.h>
 #include <mpeg2structs.h>
 
 #ifndef __ISampleGrabberCB_FWD_DEFINED__
@@ -280,24 +279,3 @@ static FORCEINLINE HRESULT ISampleGrabber_SetCallback(ISampleGrabber* This,ISamp
 
 
 #endif  /* __ISampleGrabber_INTERFACE_DEFINED__ */
-
-
-extern "C" {
-DEFINE_GUID(CLSID_DigitalCableNetworkType,
-    0x143827AB,0xF77B,0x498d,0x81,0xCA,0x5A,0x00,0x7A,0xEC,0x28,0xBF);
-
-/* KSCATEGORY_BDA */
-DEFINE_GUID(KSCATEGORY_BDA_NETWORK_PROVIDER,
-    0x71985F4B,0x1CA1,0x11d3,0x9C,0xC8,0x00,0xC0,0x4F,0x79,0x71,0xE0);
-DEFINE_GUID(KSCATEGORY_BDA_TRANSPORT_INFORMATION,
-    0xa2e3074f,0x6c3d,0x11d3,0xb6,0x53,0x00,0xc0,0x4f,0x79,0x49,0x8e);
-DEFINE_GUID(KSCATEGORY_BDA_RECEIVER_COMPONENT,
-    0xFD0A5AF4,0xB41D,0x11d2,0x9c,0x95,0x00,0xc0,0x4f,0x79,0x71,0xe0);
-DEFINE_GUID(KSCATEGORY_BDA_NETWORK_TUNER,
-    0x71985f48,0x1ca1,0x11d3,0x9c,0xc8,0x00,0xc0,0x4f,0x79,0x71,0xe0);
-DEFINE_GUID(KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT,
-    0xF4AEB342,0x0329,0x4fdd,0xA8,0xFD,0x4A,0xFF,0x49,0x26,0xC9,0x78);
-
-extern const CLSID CLSID_SampleGrabber; // found in strmiids
-
-};



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/139b23e07ed2885fd078cb0677a304462f72dc52...156459ca9d8fd62b3dbc817bc62eca245bd7a67d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/139b23e07ed2885fd078cb0677a304462f72dc52...156459ca9d8fd62b3dbc817bc62eca245bd7a67d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance