Skip to content

Commit

Permalink
Legacy is gone; (#30), (#32), (#34) implemented
Browse files Browse the repository at this point in the history
  • Loading branch information
nhielost committed Nov 8, 2022
1 parent 7c3af85 commit 55bc8a5
Show file tree
Hide file tree
Showing 21 changed files with 539 additions and 1,260 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/check-format.sh
Expand Up @@ -50,7 +50,7 @@ find . -type d \( \
-path ./plugins/mac-syphon/syphon-framework -o \
-path ./plugins/obs-outputs/ftl-sdk -o \
-path ./plugins/obs-websocket/deps -o \
-path ./src/forms/macros \
-path ./src/macros \
\) -prune -false -type f -o \
-name '*.h' -or \
-name '*.hpp' -or \
Expand Down
12 changes: 5 additions & 7 deletions CMakeLists.txt
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16...3.21)

# Change obs-plugintemplate to your plugin's name in a machine-readable format
# (e.g.: obs-myawesomeplugin) and set
project(obs-midi-mg VERSION 2.0.0)
project(obs-midi-mg VERSION 2.1.0)
add_library(obs-midi-mg MODULE)

# Replace `Your Name Here` with the name (yours or your organization's) you want
Expand Down Expand Up @@ -38,8 +38,7 @@ target_sources(
./src/mmg-message.cpp
./src/mmg-utils.cpp
./src/obs-midi-mg.cpp
./src/forms/echo/mmg-echo-window.cpp
./src/forms/legacy/mmg-legacy-window.cpp)
./src/ui/mmg-echo-window.cpp)

target_sources(
obs-midi-mg
Expand All @@ -50,9 +49,8 @@ target_sources(
./src/mmg-message.h
./src/mmg-utils.h
./src/obs-midi-mg.h
./src/forms/echo/mmg-echo-window.h
./src/forms/legacy/mmg-legacy-window.h
./src/forms/macros/mmg-window-macros.h)
./src/ui/mmg-echo-window.h
./src/macros/mmg-window-macros.h)

# Import libobs as main plugin dependency
find_package(libobs REQUIRED)
Expand Down Expand Up @@ -105,7 +103,7 @@ elseif(OS_MACOS)

set(MACOSX_PLUGIN_GUI_IDENTIFIER "${MACOS_BUNDLEID}")
set(MACOSX_PLUGIN_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION}")
set(MACOSX_PLUGIN_SHORT_VERSION_STRING "2.0.0")
set(MACOSX_PLUGIN_SHORT_VERSION_STRING "2.1.0")

target_compile_options(obs-midi-mg PRIVATE -Wall)
# --- End of section ---
Expand Down
67 changes: 35 additions & 32 deletions HELP.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -21,7 +21,7 @@ Go to the [Releases page](https://github.com/nhielost/obs-midi-mg/releases) and

## Help

If something needs an explanation in the plugin, click the *Help* button in the plugin, or click [here](HELP.md).
If help is needed, click the *Help* button in the plugin, or click [here](HELP.md).

I would love to hear honestly from you about this plugin. Feel free to share some ideas and don't be afraid to [report an issue](https://github.com/nhielost/obs-midi-mg/issues) or [post on the OBS forum discussion](https://obsproject.com/forum/threads/obs-midi-mg.158407/)!

Expand Down
6 changes: 3 additions & 3 deletions buildspec.json
@@ -1,10 +1,10 @@
{
"dependencies": {
"obs-studio": {
"version": "28.0.3",
"version": "28.1.2",
"repository": "https://github.com/obsproject/obs-studio.git",
"branch": "master",
"hash": "d21891b3ca1a8607de479687cd2e12a4455525d7"
"hash": "567505b2ed2db8a9e331a6e1b372e3d2f9dd1070"
},
"prebuilt": {
"version": "2022-08-02",
Expand Down Expand Up @@ -79,5 +79,5 @@
}
},
"name": "obs-midi-mg",
"version": "2.0.0"
"version": "2.1.0"
}

0 comments on commit 55bc8a5

Please sign in to comment.