Skip to content

W
wine-winehq
Commit c437e3d9 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

dmusic: Remove some unused functions.

parent 8882dab0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 174 deletions
dlls/dmusic/dmusic.c
View file @ c437e3d9
......@@ -230,23 +230,6 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = {
IDirectMusic8Impl_SetExternalMasterClock
};
/* helper stuff */
void register_waveport (LPGUID lpGUID, LPCSTR lpszDesc, LPCSTR lpszDrvName, LPVOID lpContext) {
LPDMUS_PORTCAPS pPortCaps = (LPDMUS_PORTCAPS)lpContext;
pPortCaps->dwSize = sizeof(DMUS_PORTCAPS);
pPortCaps->dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE;
pPortCaps->guidPort = *lpGUID;
pPortCaps->dwClass = DMUS_PC_OUTPUTCLASS;
pPortCaps->dwType = DMUS_PORT_WINMM_DRIVER;
pPortCaps->dwMemorySize = DMUS_PC_SYSTEMMEMORY;
pPortCaps->dwMaxChannelGroups = 2;
pPortCaps->dwMaxVoices = -1;
pPortCaps->dwMaxAudioChannels = -1;
pPortCaps->dwEffectFlags = DMUS_EFFECT_REVERB | DMUS_EFFECT_CHORUS | DMUS_EFFECT_DELAY;
MultiByteToWideChar (CP_ACP, 0, lpszDesc, -1, pPortCaps->wszDescription, sizeof(pPortCaps->wszDescription)/sizeof(WCHAR));
}
/* for ClassFactory */
HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) {
IDirectMusic8Impl *dmusic;
......
dlls/dmusic/dmusic_main.c
View file @ c437e3d9
......@@ -219,7 +219,7 @@ const char *debugstr_fourcc (DWORD fourcc) {
}
/* DMUS_VERSION struct to string conversion for debug messages */
const char *debugstr_dmversion (const DMUS_VERSION *version) {
static const char *debugstr_dmversion (const DMUS_VERSION *version) {
if (!version) return "'null'";
return wine_dbg_sprintf ("\'%i,%i,%i,%i\'",
(int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF),
......@@ -410,144 +410,8 @@ const char *debugstr_dmguid (const GUID *id) {
return debugstr_guid(id);
}
/* returns name of given error code */
const char *debugstr_dmreturn (DWORD code) {
static const flag_info codes[] = {
FE(S_OK),
FE(S_FALSE),
FE(DMUS_S_PARTIALLOAD),
FE(DMUS_S_PARTIALDOWNLOAD),
FE(DMUS_S_REQUEUE),
FE(DMUS_S_FREE),
FE(DMUS_S_END),
FE(DMUS_S_STRING_TRUNCATED),
FE(DMUS_S_LAST_TOOL),
FE(DMUS_S_OVER_CHORD),
FE(DMUS_S_UP_OCTAVE),
FE(DMUS_S_DOWN_OCTAVE),
FE(DMUS_S_NOBUFFERCONTROL),
FE(DMUS_S_GARBAGE_COLLECTED),
FE(DMUS_E_DRIVER_FAILED),
FE(DMUS_E_PORTS_OPEN),
FE(DMUS_E_DEVICE_IN_USE),
FE(DMUS_E_INSUFFICIENTBUFFER),
FE(DMUS_E_BUFFERNOTSET),
FE(DMUS_E_BUFFERNOTAVAILABLE),
FE(DMUS_E_NOTADLSCOL),
FE(DMUS_E_INVALIDOFFSET),
FE(DMUS_E_ALREADY_LOADED),
FE(DMUS_E_INVALIDPOS),
FE(DMUS_E_INVALIDPATCH),
FE(DMUS_E_CANNOTSEEK),
FE(DMUS_E_CANNOTWRITE),
FE(DMUS_E_CHUNKNOTFOUND),
FE(DMUS_E_INVALID_DOWNLOADID),
FE(DMUS_E_NOT_DOWNLOADED_TO_PORT),
FE(DMUS_E_ALREADY_DOWNLOADED),
FE(DMUS_E_UNKNOWN_PROPERTY),
FE(DMUS_E_SET_UNSUPPORTED),
FE(DMUS_E_GET_UNSUPPORTED),
FE(DMUS_E_NOTMONO),
FE(DMUS_E_BADARTICULATION),
FE(DMUS_E_BADINSTRUMENT),
FE(DMUS_E_BADWAVELINK),
FE(DMUS_E_NOARTICULATION),
FE(DMUS_E_NOTPCM),
FE(DMUS_E_BADWAVE),
FE(DMUS_E_BADOFFSETTABLE),
FE(DMUS_E_UNKNOWNDOWNLOAD),
FE(DMUS_E_NOSYNTHSINK),
FE(DMUS_E_ALREADYOPEN),
FE(DMUS_E_ALREADYCLOSED),
FE(DMUS_E_SYNTHNOTCONFIGURED),
FE(DMUS_E_SYNTHACTIVE),
FE(DMUS_E_CANNOTREAD),
FE(DMUS_E_DMUSIC_RELEASED),
FE(DMUS_E_BUFFER_EMPTY),
FE(DMUS_E_BUFFER_FULL),
FE(DMUS_E_PORT_NOT_CAPTURE),
FE(DMUS_E_PORT_NOT_RENDER),
FE(DMUS_E_DSOUND_NOT_SET),
FE(DMUS_E_ALREADY_ACTIVATED),
FE(DMUS_E_INVALIDBUFFER),
FE(DMUS_E_WAVEFORMATNOTSUPPORTED),
FE(DMUS_E_SYNTHINACTIVE),
FE(DMUS_E_DSOUND_ALREADY_SET),
FE(DMUS_E_INVALID_EVENT),
FE(DMUS_E_UNSUPPORTED_STREAM),
FE(DMUS_E_ALREADY_INITED),
FE(DMUS_E_INVALID_BAND),
FE(DMUS_E_TRACK_HDR_NOT_FIRST_CK),
FE(DMUS_E_TOOL_HDR_NOT_FIRST_CK),
FE(DMUS_E_INVALID_TRACK_HDR),
FE(DMUS_E_INVALID_TOOL_HDR),
FE(DMUS_E_ALL_TOOLS_FAILED),
FE(DMUS_E_ALL_TRACKS_FAILED),
FE(DMUS_E_NOT_FOUND),
FE(DMUS_E_NOT_INIT),
FE(DMUS_E_TYPE_DISABLED),
FE(DMUS_E_TYPE_UNSUPPORTED),
FE(DMUS_E_TIME_PAST),
FE(DMUS_E_TRACK_NOT_FOUND),
FE(DMUS_E_TRACK_NO_CLOCKTIME_SUPPORT),
FE(DMUS_E_NO_MASTER_CLOCK),
FE(DMUS_E_LOADER_NOCLASSID),
FE(DMUS_E_LOADER_BADPATH),
FE(DMUS_E_LOADER_FAILEDOPEN),
FE(DMUS_E_LOADER_FORMATNOTSUPPORTED),
FE(DMUS_E_LOADER_FAILEDCREATE),
FE(DMUS_E_LOADER_OBJECTNOTFOUND),
FE(DMUS_E_LOADER_NOFILENAME),
FE(DMUS_E_INVALIDFILE),
FE(DMUS_E_ALREADY_EXISTS),
FE(DMUS_E_OUT_OF_RANGE),
FE(DMUS_E_SEGMENT_INIT_FAILED),
FE(DMUS_E_ALREADY_SENT),
FE(DMUS_E_CANNOT_FREE),
FE(DMUS_E_CANNOT_OPEN_PORT),
FE(DMUS_E_CANNOT_CONVERT),
FE(DMUS_E_DESCEND_CHUNK_FAIL),
FE(DMUS_E_NOT_LOADED),
FE(DMUS_E_SCRIPT_LANGUAGE_INCOMPATIBLE),
FE(DMUS_E_SCRIPT_UNSUPPORTED_VARTYPE),
FE(DMUS_E_SCRIPT_ERROR_IN_SCRIPT),
FE(DMUS_E_SCRIPT_CANTLOAD_OLEAUT32),
FE(DMUS_E_SCRIPT_LOADSCRIPT_ERROR),
FE(DMUS_E_SCRIPT_INVALID_FILE),
FE(DMUS_E_INVALID_SCRIPTTRACK),
FE(DMUS_E_SCRIPT_VARIABLE_NOT_FOUND),
FE(DMUS_E_SCRIPT_ROUTINE_NOT_FOUND),
FE(DMUS_E_SCRIPT_CONTENT_READONLY),
FE(DMUS_E_SCRIPT_NOT_A_REFERENCE),
FE(DMUS_E_SCRIPT_VALUE_NOT_SUPPORTED),
FE(DMUS_E_INVALID_SEGMENTTRIGGERTRACK),
FE(DMUS_E_INVALID_LYRICSTRACK),
FE(DMUS_E_INVALID_PARAMCONTROLTRACK),
FE(DMUS_E_AUDIOVBSCRIPT_SYNTAXERROR),
FE(DMUS_E_AUDIOVBSCRIPT_RUNTIMEERROR),
FE(DMUS_E_AUDIOVBSCRIPT_OPERATIONFAILURE),
FE(DMUS_E_AUDIOPATHS_NOT_VALID),
FE(DMUS_E_AUDIOPATHS_IN_USE),
FE(DMUS_E_NO_AUDIOPATH_CONFIG),
FE(DMUS_E_AUDIOPATH_INACTIVE),
FE(DMUS_E_AUDIOPATH_NOBUFFER),
FE(DMUS_E_AUDIOPATH_NOPORT),
FE(DMUS_E_NO_AUDIOPATH),
FE(DMUS_E_INVALIDCHUNK),
FE(DMUS_E_AUDIOPATH_NOGLOBALFXBUFFER),
FE(DMUS_E_INVALID_CONTAINER_OBJECT)
};
unsigned int i;
for (i = 0; i < sizeof(codes)/sizeof(codes[0]); i++) {
if (code == codes[i].val)
return codes[i].name;
}
/* if we didn't find it, return value */
return wine_dbg_sprintf("0x%08x", code);
}
/* generic flag-dumping function */
const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){
static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){
char buffer[128] = "", *ptr = &buffer[0];
unsigned int i;
int size = sizeof(buffer);
......@@ -567,7 +431,7 @@ const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_name
}
/* dump DMUS_OBJ flags */
const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) {
static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) {
static const flag_info flags[] = {
FE(DMUS_OBJ_OBJECT),
FE(DMUS_OBJ_CLASS),
......
dlls/dmusic/dmusic_private.h
View file @ c437e3d9
......@@ -55,11 +55,6 @@ typedef struct IReferenceClockImpl IReferenceClockImpl;
typedef struct IDirectMusicCollectionImpl IDirectMusicCollectionImpl;
typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl;
/*****************************************************************************
* Predeclare the interface implementation structures
*/
extern const IDirectMusicPortVtbl DirectMusicPort_Vtbl;
/*****************************************************************************
* Some stuff to make my life easier :=)
......@@ -255,11 +250,6 @@ extern LONG DMUSIC_refCount;
static inline void DMUSIC_LockModule(void) { InterlockedIncrement( &DMUSIC_refCount ); }
static inline void DMUSIC_UnlockModule(void) { InterlockedDecrement( &DMUSIC_refCount ); }
/*****************************************************************************
* Helper Functions
*/
void register_waveport (LPGUID lpGUID, LPCSTR lpszDesc, LPCSTR lpszDrvName, LPVOID lpContext);
/*****************************************************************************
* Misc.
......@@ -304,15 +294,8 @@ extern void Patch2MIDILOCALE (DWORD dwPatch, LPMIDILOCALE pLocale);
extern int even_or_odd (DWORD number);
/* FOURCC to string conversion for debug messages */
extern const char *debugstr_fourcc (DWORD fourcc);
/* DMUS_VERSION struct to string conversion for debug messages */
extern const char *debugstr_dmversion (const DMUS_VERSION *version);
/* returns name of given GUID */
extern const char *debugstr_dmguid (const GUID *id);
/* returns name of given error code */
extern const char *debugstr_dmreturn (DWORD code);
/* generic flags-dumping function */
extern const char *debugstr_flags (DWORD flags, const flag_info* names, size_t num_names);
extern const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask);
/* dump whole DMUS_OBJECTDESC struct */
extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc);
......
dlls/dmusic/port.c
View file @ c437e3d9
......@@ -213,7 +213,7 @@ static HRESULT WINAPI IDirectMusicPortImpl_GetFormat (LPDIRECTMUSICPORT iface, L
return S_OK;
}
const IDirectMusicPortVtbl DirectMusicPort_Vtbl = {
static const IDirectMusicPortVtbl DirectMusicPort_Vtbl = {
IDirectMusicPortImpl_QueryInterface,
IDirectMusicPortImpl_AddRef,
IDirectMusicPortImpl_Release,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment