dmband: Move band.c to dmusic.

dlls/dmband/bandtrack.c

@@ -17,6 +17,7 @@
  */
 
 #include "dmband_private.h"
+#include "dmusic_band.h"
 #include "dmobject.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmband);

dlls/dmband/dmband_main.c

@@ -20,6 +20,7 @@
 #include "initguid.h"
 #include "dmband_private.h"
 #include "rpcproxy.h"
+#include "dmusic_band.h"
 #include "dmobject.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmband);

dlls/dmband/dmband_private.h

@@ -20,21 +20,16 @@
 #ifndef __WINE_DMBAND_PRIVATE_H
 #define __WINE_DMBAND_PRIVATE_H
 
-#include <stdio.h>
 #include <stdarg.h>
-#include <string.h>
 
 #define COBJMACROS
 
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
-#include "wingdi.h"
-#include "winuser.h"
 
 #include "wine/debug.h"
 #include "wine/list.h"
-#include "winreg.h"
 #include "objbase.h"
 
 #include "dmusici.h"
@@ -44,11 +39,6 @@
 /*****************************************************************************
  * ClassFactory
  */
-extern HRESULT create_dmband(REFIID riid, void **ret_iface);
 extern HRESULT create_dmbandtrack(REFIID riid, void **ret_iface);
 
-extern HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection);
-extern HRESULT band_send_messages(IDirectMusicBand *iface, IDirectMusicPerformance *performance,
-        IDirectMusicGraph *graph, MUSIC_TIME time, DWORD track_id);
-
 #endif	/* __WINE_DMBAND_PRIVATE_H */

dlls/dmusic/Makefile.in

@@ -2,6 +2,7 @@ MODULE    = dmusic.dll
 IMPORTS   = dxguid uuid ole32 advapi32 dsound user32 winmm
 
 SOURCES = \
+	band.c \
 	buffer.c \
 	clock.c \
 	collection.c \

dlls/dmband/band.c → dlls/dmusic/band.c

@@ -17,8 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "dmband_private.h"
-#include "dmobject.h"
+#include "dmusic_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmband);
 

dlls/dmusic/dmusic_band.h

+/* DirectMusicBand Private Include
+ *
+ * Copyright (C) 2024 Yuxuan Shui for CodeWeavers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "dmusici.h"
+
+extern HRESULT create_dmband(REFIID riid, void **ret_iface);
+extern HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection);
+extern HRESULT band_send_messages(IDirectMusicBand *iface, IDirectMusicPerformance *performance,
+        IDirectMusicGraph *graph, MUSIC_TIME time, DWORD track_id);