From 3d7c5baf7ced99ca41208274e884098bce86328e Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 1 Feb 2024 21:41:01 +0100 Subject: [PATCH] Final rename Signed-off-by: falkTX --- JackBridge.c | 8 ++++---- Makefile | 10 +++++----- asio.c | 20 +++++++++---------- ...p-asio.dll.def => mod-desktop-asio.dll.def | 4 ++-- regsvr.c | 8 ++++---- 5 files changed, 25 insertions(+), 25 deletions(-) rename mod-desktop-app-asio.dll.def => mod-desktop-asio.dll.def (61%) diff --git a/JackBridge.c b/JackBridge.c index d45a5af..565ecdc 100644 --- a/JackBridge.c +++ b/JackBridge.c @@ -305,25 +305,25 @@ static void jackbridge_init(JackBridge* const bridge) WCHAR path[MAX_PATH]; if (SHGetFolderPathW(NULL, CSIDL_PROGRAM_FILES, NULL, SHGFP_TYPE_CURRENT, path) != S_OK) { - fprintf(stderr, "Failed to load MOD Desktop App JACK DLL\n"); + fprintf(stderr, "Failed to load MOD Desktop JACK DLL\n"); return; } WCHAR *path2 = path; while (*path2++) {} --path2; - memcpy(path2, L"\\MOD Desktop App\\libjack64.dll", sizeof(WCHAR)*23); + memcpy(path2, L"\\MOD Desktop\\libjack64.dll", sizeof(WCHAR)*23); const HANDLE lib = LoadLibraryW(path); if (lib == NULL) { - fwprintf(stderr, L"Failed to load MOD Desktop App JACK '%ls'\n", path); + fwprintf(stderr, L"Failed to load MOD Desktop JACK '%ls'\n", path); return; } else { - fwprintf(stdout, L"MOD Desktop App JACK '%ls' loaded successfully!\n", path); + fwprintf(stdout, L"MOD Desktop JACK '%ls' loaded successfully!\n", path); } #define JOIN(a, b) a ## b diff --git a/Makefile b/Makefile index 0896127..50725b5 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/make -f -# Makefile for MOD Desktop App ASIO # -# --------------------------------- # +# Makefile for MOD Desktop ASIO # +# ----------------------------- # # Created by falkTX # @@ -35,7 +35,7 @@ OBJS = $(SRCS:%.c=build/%.c.o) ### Generic targets -all: mod-desktop-app-asio.dll +all: mod-desktop-asio.dll ### Build rules @@ -49,5 +49,5 @@ build/%.c.o: %.c ### Target specific build rules -mod-desktop-app-asio.dll: $(OBJS) - $(CC) $^ $(CFLAGS) $(LDFLAGS) -shared mod-desktop-app-asio.dll.def -lodbc32 -lole32 -luuid -lwinmm -o $@ +mod-desktop-asio.dll: $(OBJS) + $(CC) $^ $(CFLAGS) $(LDFLAGS) -shared mod-desktop-asio.dll.def -lodbc32 -lole32 -luuid -lwinmm -o $@ diff --git a/asio.c b/asio.c index 293ee0c..468ce1f 100644 --- a/asio.c +++ b/asio.c @@ -348,7 +348,7 @@ ULONG STDMETHODCALLTYPE Release(LPWINEASIO iface) if (This->input_channel) HeapFree(GetProcessHeap(), 0, This->input_channel); } - TRACE("MOD Desktop App terminated\n\n"); + TRACE("MOD Desktop terminated\n\n"); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); return ref; @@ -381,7 +381,7 @@ ASIOBool STDMETHODCALLTYPE Init(LPWINEASIO iface, void *sysRef) if (!jackbridge_is_ok()) { - WARN("MOD Desktop App is not installed, cannot use ASIO driver\n"); + WARN("MOD Desktop is not installed, cannot use ASIO driver\n"); return ASIOFalse; } @@ -389,7 +389,7 @@ ASIOBool STDMETHODCALLTYPE Init(LPWINEASIO iface, void *sysRef) // mlockall(MCL_FUTURE); // TODO allow any client name on mod-ui side - if (!(This->jack_client = jackbridge_client_open("mod-external", jack_options, &jack_status, "mod-desktop-app"))) + if (!(This->jack_client = jackbridge_client_open("mod-external", jack_options, &jack_status, "mod-desktop"))) { WARN("Unable to open a JACK client as: %s\n", "mod-external"); return ASIOFalse; @@ -464,7 +464,7 @@ ASIOBool STDMETHODCALLTYPE Init(LPWINEASIO iface, void *sysRef) } This->asio_driver_state = Initialized; - TRACE("MOD Desktop App 0.%.1f initialized\n",(float) This->asio_version / 10); + TRACE("MOD Desktop 0.%.1f initialized\n",(float) This->asio_version / 10); return ASIOTrue; } @@ -477,7 +477,7 @@ DEFINE_THISCALL_WRAPPER(GetDriverName,8) void STDMETHODCALLTYPE GetDriverName(LPWINEASIO iface, char *name) { TRACE("iface: %p, name: %p\n", iface, name); - strcpy(name, "MOD Desktop App"); + strcpy(name, "MOD Desktop"); return; } @@ -504,7 +504,7 @@ DEFINE_THISCALL_WRAPPER(GetErrorMessage,8) void STDMETHODCALLTYPE GetErrorMessage(LPWINEASIO iface, char *string) { TRACE("iface: %p, string: %p)\n", iface, string); - strcpy(string, "MOD Desktop App does not return error messages\n"); + strcpy(string, "MOD Desktop does not return error messages\n"); return; } @@ -565,7 +565,7 @@ ASIOError STDMETHODCALLTYPE Start(LPWINEASIO iface) This->asio_buffer_index = This->asio_buffer_index ? 0 : 1; This->asio_driver_state = Running; - TRACE("MOD Desktop App successfully loaded\n"); + TRACE("MOD Desktop successfully loaded\n"); return ASE_OK; } @@ -1000,11 +1000,11 @@ ASIOError STDMETHODCALLTYPE CreateBuffers(LPWINEASIO iface, ASIOBufferInfo *buff if (!jackbridge_activate(This->jack_client)) return ASE_NotPresent; - /* connect to the mod-desktop-app io */ + /* connect to the mod-desktop io */ jackbridge_connect(This->jack_client, "mod-monitor:out_1", jackbridge_port_name(This->input_channel[0].port)); jackbridge_connect(This->jack_client, "mod-monitor:out_2", jackbridge_port_name(This->input_channel[1].port)); - // TODO define inputs from mod-desktop-app side + // TODO define inputs from mod-desktop side // jack_connect(This->jack_client, jack_port_name(This->output_channel[0].port), ""); // jack_connect(This->jack_client, jack_port_name(This->output_channel[1].port), ""); @@ -1070,7 +1070,7 @@ ASIOError STDMETHODCALLTYPE ControlPanel(LPWINEASIO iface) { TRACE("iface: %p\n", iface); - HANDLE openEvent = OpenEventA(EVENT_MODIFY_STATE, false, "Global\\mod-desktop-app-open"); + HANDLE openEvent = OpenEventA(EVENT_MODIFY_STATE, false, "Global\\mod-desktop-open"); if (openEvent) { diff --git a/mod-desktop-app-asio.dll.def b/mod-desktop-asio.dll.def similarity index 61% rename from mod-desktop-app-asio.dll.def rename to mod-desktop-asio.dll.def index 9737b66..564cba7 100644 --- a/mod-desktop-app-asio.dll.def +++ b/mod-desktop-asio.dll.def @@ -1,5 +1,5 @@ -LIBRARY mod-desktop-app -DESCRIPTION 'MOD Desktop App ASIO Driver' +LIBRARY mod-desktop-asio +DESCRIPTION 'MOD Desktop ASIO Driver' EXPORTS DllMain DllGetClassObject diff --git a/regsvr.c b/regsvr.c index 57db042..dc65a6e 100644 --- a/regsvr.c +++ b/regsvr.c @@ -500,7 +500,7 @@ static GUID const CLSID_WineASIO = { 0x48d0c522, 0xbfcc, 0x45cc, { 0x8b, 0x84, 0x17, 0xf2, 0x5f, 0x33, 0xe6, 0xe9 } }; static struct regsvr_coclass const coclass_list[] = { - { &CLSID_WineASIO, "MOD Desktop App ASIO Object", NULL, "mod-desktop-app-asio.dll", "Apartment" }, + { &CLSID_WineASIO, "MOD Desktop ASIO Object", NULL, "mod-desktop-asio.dll", "Apartment" }, { NULL } /* list terminator */ }; @@ -517,11 +517,11 @@ static struct regsvr_interface const interface_list[] = { */ static HRESULT register_driver(void) { - LPCSTR asio_key = "Software\\ASIO\\MOD Desktop App"; + LPCSTR asio_key = "Software\\ASIO\\MOD Desktop"; LPCSTR clsid = "CLSID"; LPCSTR wine_clsid = "{48D0C522-BFCC-45CC-8B84-17F25F33E6E9}"; LPCSTR desc = "Description"; - LPCSTR wine_desc = "MOD Desktop App"; + LPCSTR wine_desc = "MOD Desktop"; HKEY key; LONG rc; @@ -567,7 +567,7 @@ HRESULT WINAPI DllRegisterServer(void) */ static HRESULT unregister_driver(void) { - LPCSTR asio_key = "Software\\ASIO\\MOD Desktop App"; + LPCSTR asio_key = "Software\\ASIO\\MOD Desktop"; /* FIXME */ return recursive_delete_keyA(HKEY_LOCAL_MACHINE, asio_key);