diff --git a/cmake/bundle/windows/obs-studio.ico b/cmake/bundle/windows/obs-studio.ico index 7127372917d0ae..d74dbbd2789388 100644 Binary files a/cmake/bundle/windows/obs-studio.ico and b/cmake/bundle/windows/obs-studio.ico differ diff --git a/cmake/common/bootstrap.cmake b/cmake/common/bootstrap.cmake index e6caa7c841b392..d0575051529367 100644 --- a/cmake/common/bootstrap.cmake +++ b/cmake/common/bootstrap.cmake @@ -41,10 +41,10 @@ if("${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") endif() # Set default global project variables -set(OBS_COMPANY_NAME "OBS Project") -set(OBS_PRODUCT_NAME "OBS Studio") -set(OBS_WEBSITE "https://www.obsproject.com") -set(OBS_COMMENTS "Free and open source software for video recording and live streaming") +set(OBS_COMPANY_NAME "MOQBS") +set(OBS_PRODUCT_NAME "MOQBS") +set(OBS_WEBSITE "https://moq.dev") +set(OBS_COMMENTS "Media over QUIC broadcasting software") set(OBS_LEGAL_COPYRIGHT "(C) Lain Bailey") set(OBS_CMAKE_VERSION 3.0.0) diff --git a/cmake/macos/helpers.cmake b/cmake/macos/helpers.cmake index 8913b2b24f9d96..6c9d3a2b9c7611 100644 --- a/cmake/macos/helpers.cmake +++ b/cmake/macos/helpers.cmake @@ -43,7 +43,7 @@ function(set_target_properties_obs target) set_target_properties( ${target} PROPERTIES - OUTPUT_NAME OBS + OUTPUT_NAME MOQBS MACOSX_BUNDLE TRUE MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in" XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY YES @@ -54,8 +54,8 @@ function(set_target_properties_obs target) set_target_xcode_properties( ${target} - PROPERTIES PRODUCT_BUNDLE_IDENTIFIER com.obsproject.obs-studio - PRODUCT_NAME OBS + PROPERTIES PRODUCT_BUNDLE_IDENTIFIER dev.moq.moqbs + PRODUCT_NAME MOQBS ASSETCATALOG_COMPILER_APPICON_NAME AppIcon CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER} MARKETING_VERSION ${OBS_VERSION_CANONICAL} @@ -64,11 +64,11 @@ function(set_target_properties_obs target) CLANG_ENABLE_OBJC_ARC YES SKIP_INSTALL NO INSTALL_PATH "$(LOCAL_APPS_DIR)" - INFOPLIST_KEY_CFBundleDisplayName "OBS Studio" + INFOPLIST_KEY_CFBundleDisplayName "MOQBS" INFOPLIST_KEY_NSHumanReadableCopyright "(c) 2012-${CURRENT_YEAR} Lain Bailey" - INFOPLIST_KEY_NSCameraUsageDescription "OBS needs to access the camera to enable camera sources to work." - INFOPLIST_KEY_NSMicrophoneUsageDescription "OBS needs to access the microphone to enable audio input." - INFOPLIST_KEY_NSAppleEventsUsageDescription "OBS needs to access background events to enable hotkeys while not in focus." + INFOPLIST_KEY_NSCameraUsageDescription "MOQBS needs to access the camera to enable camera sources to work." + INFOPLIST_KEY_NSMicrophoneUsageDescription "MOQBS needs to access the microphone to enable audio input." + INFOPLIST_KEY_NSAppleEventsUsageDescription "MOQBS needs to access background events to enable hotkeys while not in focus." ) get_property(obs_dependencies GLOBAL PROPERTY _OBS_DEPENDENCIES) @@ -224,7 +224,7 @@ function(set_target_properties_obs target) PROPERTIES DYLIB_COMPATIBILITY_VERSION 1.0 DYLIB_CURRENT_VERSION ${OBS_VERSION_MAJOR} PRODUCT_NAME ${target} - PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target} + PRODUCT_BUNDLE_IDENTIFIER dev.moq.${target} SKIP_INSTALL YES ) @@ -232,7 +232,7 @@ function(set_target_properties_obs target) if(is_framework) set_target_properties( ${target} - PROPERTIES FRAMEWORK_VERSION A MACOSX_FRAMEWORK_IDENTIFIER com.obsproject.${target} + PROPERTIES FRAMEWORK_VERSION A MACOSX_FRAMEWORK_IDENTIFIER dev.moq.${target} ) set_target_xcode_properties( @@ -241,7 +241,7 @@ function(set_target_properties_obs target) DEVELOPMENT_TEAM "" SKIP_INSTALL YES PRODUCT_NAME ${target} - PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target} + PRODUCT_BUNDLE_IDENTIFIER dev.moq.${target} CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER} MARKETING_VERSION ${OBS_VERSION_CANONICAL} GENERATE_INFOPLIST_FILE YES @@ -258,13 +258,13 @@ function(set_target_properties_obs target) set_target_xcode_properties( ${target} PROPERTIES PRODUCT_NAME ${target} - PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target} + PRODUCT_BUNDLE_IDENTIFIER dev.moq.${target} ) elseif(target STREQUAL obslua) set_target_xcode_properties( ${target} PROPERTIES PRODUCT_NAME ${target} - PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target} + PRODUCT_BUNDLE_IDENTIFIER dev.moq.${target} ) elseif(target STREQUAL obs-dal-plugin) set_target_properties(${target} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) @@ -276,7 +276,7 @@ function(set_target_properties_obs target) set_target_xcode_properties( ${target} PROPERTIES PRODUCT_NAME ${target} - PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target} + PRODUCT_BUNDLE_IDENTIFIER dev.moq.${target} CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER} MARKETING_VERSION ${OBS_VERSION_CANONICAL} GENERATE_INFOPLIST_FILE YES diff --git a/cmake/macos/resources/AppIcon.icns b/cmake/macos/resources/AppIcon.icns index 2f742868fb01dd..83296519359bb7 100644 Binary files a/cmake/macos/resources/AppIcon.icns and b/cmake/macos/resources/AppIcon.icns differ diff --git a/docs/sphinx/favicon.ico b/docs/sphinx/favicon.ico index 76b7bca8b6aeaf..69fa260148809b 100644 Binary files a/docs/sphinx/favicon.ico and b/docs/sphinx/favicon.ico differ diff --git a/docs/sphinx/logo.svg b/docs/sphinx/logo.svg index b37fc4b16d4b29..020a47d06163b7 100644 --- a/docs/sphinx/logo.svg +++ b/docs/sphinx/logo.svg @@ -1,268 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/frontend/OBSApp.cpp b/frontend/OBSApp.cpp index 668b44300af8a3..34e635c660a2b3 100644 --- a/frontend/OBSApp.cpp +++ b/frontend/OBSApp.cpp @@ -915,7 +915,7 @@ OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store) setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png"))); #endif - setDesktopFileName("com.obsproject.Studio"); + setDesktopFileName("dev.moq.moqbs"); pluginManager_ = std::make_unique(); } diff --git a/frontend/cmake/linux/com.obsproject.Studio.desktop b/frontend/cmake/linux/com.obsproject.Studio.desktop index f5827058a7753a..8559b1ff818fba 100644 --- a/frontend/cmake/linux/com.obsproject.Studio.desktop +++ b/frontend/cmake/linux/com.obsproject.Studio.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Version=1.0 -Name=OBS Studio +Name=MOQBS GenericName=Streaming/Recording Software Comment=Free and Open Source Streaming/Recording Software Exec=obs diff --git a/frontend/cmake/linux/com.obsproject.Studio.metainfo.xml.in b/frontend/cmake/linux/com.obsproject.Studio.metainfo.xml.in index a59d7946d846ce..f3a9e0ec48d02a 100644 --- a/frontend/cmake/linux/com.obsproject.Studio.metainfo.xml.in +++ b/frontend/cmake/linux/com.obsproject.Studio.metainfo.xml.in @@ -4,7 +4,7 @@ com.obsproject.Studio.desktop CC0-1.0 GPL-2.0-or-later - OBS Studio + MOQBS OBS Project diff --git a/frontend/cmake/linux/icons/obs-logo-128.png b/frontend/cmake/linux/icons/obs-logo-128.png index f8c688da2c71e3..b4e16b84209274 100644 Binary files a/frontend/cmake/linux/icons/obs-logo-128.png and b/frontend/cmake/linux/icons/obs-logo-128.png differ diff --git a/frontend/cmake/linux/icons/obs-logo-256.png b/frontend/cmake/linux/icons/obs-logo-256.png index aa445cdf66170d..615ef4ea948e6e 100644 Binary files a/frontend/cmake/linux/icons/obs-logo-256.png and b/frontend/cmake/linux/icons/obs-logo-256.png differ diff --git a/frontend/cmake/linux/icons/obs-logo-512.png b/frontend/cmake/linux/icons/obs-logo-512.png index a536f57a19e4aa..3fac1fa75c07a1 100644 Binary files a/frontend/cmake/linux/icons/obs-logo-512.png and b/frontend/cmake/linux/icons/obs-logo-512.png differ diff --git a/frontend/cmake/linux/icons/obs-logo-scalable.svg b/frontend/cmake/linux/icons/obs-logo-scalable.svg index 8fe847880c5c31..020a47d06163b7 100644 --- a/frontend/cmake/linux/icons/obs-logo-scalable.svg +++ b/frontend/cmake/linux/icons/obs-logo-scalable.svg @@ -1,92 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128.png index 9e3f1c345c2a00..08fb1d904591d0 100644 Binary files a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128.png and b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png index 029dff2d62156d..0ce95e7e172b5c 100644 Binary files a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png and b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16.png index 77be1238062739..c52646c53c8d72 100644 Binary files a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16.png and b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png index 97f34d8a6cc976..c742dfdcd59f71 100644 Binary files a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png and b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256.png index 2b264dde003841..0ce95e7e172b5c 100644 Binary files a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256.png and b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png index bbe8f7d94c5371..b17074c3260545 100644 Binary files a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png and b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32.png index d04efcd37009c1..c742dfdcd59f71 100644 Binary files a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32.png and b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png index f542313e02617f..3132fb4446d2bc 100644 Binary files a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png and b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512.png index 920f8d8dc771c9..b17074c3260545 100644 Binary files a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512.png and b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png index 8dbac08ae43490..8f6d1b0d202b32 100644 Binary files a/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png and b/frontend/cmake/macos/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/frontend/cmake/windows/obs-studio.ico b/frontend/cmake/windows/obs-studio.ico index 7127372917d0ae..d74dbbd2789388 100644 Binary files a/frontend/cmake/windows/obs-studio.ico and b/frontend/cmake/windows/obs-studio.ico differ diff --git a/frontend/cmake/windows/obs.rc.in b/frontend/cmake/windows/obs.rc.in index 6115c4e525e143..b9b0dbd25dccb8 100644 --- a/frontend/cmake/windows/obs.rc.in +++ b/frontend/cmake/windows/obs.rc.in @@ -7,12 +7,12 @@ BEGIN BEGIN BLOCK "040904B0" BEGIN - VALUE "CompanyName", "OBS" - VALUE "FileDescription", "OBS Studio" + VALUE "CompanyName", "MOQBS" + VALUE "FileDescription", "MOQBS" VALUE "FileVersion", "${OBS_VERSION_CANONICAL}" VALUE "InternalName", "obs" VALUE "OriginalFilename", "obs" - VALUE "ProductName", "OBS Studio" + VALUE "ProductName", "MOQBS" VALUE "ProductVersion", "${OBS_VERSION_CANONICAL}" VALUE "Comments", "Free and open source software for video recording and live streaming" VALUE "LegalCopyright", "${OBS_LEGAL_COPYRIGHT}" diff --git a/frontend/forms/images/active_mac.png b/frontend/forms/images/active_mac.png index 986bb463717a09..62b1230723a76f 100644 Binary files a/frontend/forms/images/active_mac.png and b/frontend/forms/images/active_mac.png differ diff --git a/frontend/forms/images/obs_macos.png b/frontend/forms/images/obs_macos.png index 57f2e0a7bc7431..f5d8fb133687c1 100644 Binary files a/frontend/forms/images/obs_macos.png and b/frontend/forms/images/obs_macos.png differ diff --git a/frontend/forms/images/obs_macos.svg b/frontend/forms/images/obs_macos.svg index 48d7c8e3129cbc..020a47d06163b7 100644 --- a/frontend/forms/images/obs_macos.svg +++ b/frontend/forms/images/obs_macos.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/frontend/forms/images/obs_paused_macos.png b/frontend/forms/images/obs_paused_macos.png index f80f40d7445b0d..455f340a1a37d6 100644 Binary files a/frontend/forms/images/obs_paused_macos.png and b/frontend/forms/images/obs_paused_macos.png differ diff --git a/frontend/forms/images/obs_paused_macos.svg b/frontend/forms/images/obs_paused_macos.svg index ff8ad755cd0cf4..04e3c1ba125272 100644 --- a/frontend/forms/images/obs_paused_macos.svg +++ b/frontend/forms/images/obs_paused_macos.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/frontend/forms/images/paused_mac.png b/frontend/forms/images/paused_mac.png index 0d471cd46f1a82..f825b1ddcccc34 100644 Binary files a/frontend/forms/images/paused_mac.png and b/frontend/forms/images/paused_mac.png differ diff --git a/frontend/forms/images/tray_active.png b/frontend/forms/images/tray_active.png index 22a8b92fa7d937..615ef4ea948e6e 100644 Binary files a/frontend/forms/images/tray_active.png and b/frontend/forms/images/tray_active.png differ diff --git a/frontend/forms/images/tray_active_macos.png b/frontend/forms/images/tray_active_macos.png index 5864c61a144189..615ef4ea948e6e 100644 Binary files a/frontend/forms/images/tray_active_macos.png and b/frontend/forms/images/tray_active_macos.png differ diff --git a/frontend/forms/images/tray_active_macos.svg b/frontend/forms/images/tray_active_macos.svg index 921f764c1c7468..020a47d06163b7 100644 --- a/frontend/forms/images/tray_active_macos.svg +++ b/frontend/forms/images/tray_active_macos.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/frontend/obs-main.cpp b/frontend/obs-main.cpp index 0b06d06ae58c1b..8b37251617e3be 100644 --- a/frontend/obs-main.cpp +++ b/frontend/obs-main.cpp @@ -1023,7 +1023,7 @@ int main(int argc, char *argv[]) exit(0); } else if (arg_is(argv[i], "--version", "-V")) { - std::cout << "OBS Studio - " << App()->GetVersionString(false) << "\n"; + std::cout << "MOQBS - " << App()->GetVersionString(false) << "\n"; exit(0); } } diff --git a/frontend/widgets/OBSBasic.cpp b/frontend/widgets/OBSBasic.cpp index f08527cbc0ba69..1dc84945b85457 100644 --- a/frontend/widgets/OBSBasic.cpp +++ b/frontend/widgets/OBSBasic.cpp @@ -2075,9 +2075,7 @@ void OBSBasic::UpdateTitleBar() const char *profile = config_get_string(App()->GetUserConfig(), "Basic", "Profile"); const char *sceneCollection = config_get_string(App()->GetUserConfig(), "Basic", "SceneCollection"); - name << "OBS "; - if (previewProgramMode) - name << "Studio "; + name << "MOQBS "; name << App()->GetVersionString(false); if (safe_mode) diff --git a/frontend/widgets/OBSBasic_SysTray.cpp b/frontend/widgets/OBSBasic_SysTray.cpp index e1d81501fad0e0..e52092a3bc4669 100644 --- a/frontend/widgets/OBSBasic_SysTray.cpp +++ b/frontend/widgets/OBSBasic_SysTray.cpp @@ -30,7 +30,7 @@ void OBSBasic::SystemTrayInit() QIcon trayIconFile = QIcon(":/res/images/obs.png"); #endif trayIcon = new QSystemTrayIcon(QIcon::fromTheme("obs-tray", trayIconFile), this); - trayIcon->setToolTip("OBS Studio"); + trayIcon->setToolTip("MOQBS"); showHide = new QAction(QTStr("Basic.SystemTray.Show"), trayIcon.data()); sysTrayStream = @@ -102,7 +102,7 @@ void OBSBasic::SysTrayNotify(const QString &text, QSystemTrayIcon::MessageIcon n { if (trayIcon && trayIcon->isVisible() && QSystemTrayIcon::supportsMessages()) { QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::MessageIcon(n); - trayIcon->showMessage("OBS Studio", text, icon, 10000); + trayIcon->showMessage("MOQBS", text, icon, 10000); } } diff --git a/libobs/obs-cocoa.m b/libobs/obs-cocoa.m index 08b64ef1b0aa01..d700f9f63c6237 100644 --- a/libobs/obs-cocoa.m +++ b/libobs/obs-cocoa.m @@ -46,7 +46,7 @@ void add_default_module_paths(void) char *find_libobs_data_file(const char *file) { - NSBundle *frameworkBundle = [NSBundle bundleWithIdentifier:@"com.obsproject.libobs"]; + NSBundle *frameworkBundle = [NSBundle bundleWithIdentifier:@"dev.moq.libobs"]; NSString *libobsDataPath = [[[frameworkBundle bundleURL] path] stringByAppendingFormat:@"/%@/%s", @"Resources", file]; size_t path_length = strlen(libobsDataPath.UTF8String); diff --git a/plugins/obs-moq b/plugins/obs-moq index 32a156c628c678..19d9416988b7eb 160000 --- a/plugins/obs-moq +++ b/plugins/obs-moq @@ -1 +1 @@ -Subproject commit 32a156c628c6781d7601668b0fd9f65bbfb5bb9c +Subproject commit 19d9416988b7eb3313c9d64ee88a9bfbc0d7c8ee diff --git a/release/moqbs.png b/release/moqbs.png new file mode 100644 index 00000000000000..8f6d1b0d202b32 Binary files /dev/null and b/release/moqbs.png differ diff --git a/release/moqbs.svg b/release/moqbs.svg new file mode 100644 index 00000000000000..020a47d06163b7 --- /dev/null +++ b/release/moqbs.svg @@ -0,0 +1,8 @@ + + + + + + + +