From 7573d349eb246b89da64e8186184d2ac6eb58d55 Mon Sep 17 00:00:00 2001 From: Christopher P Yarger Date: Sat, 20 Mar 2021 15:57:31 -0400 Subject: [PATCH 1/3] Update obs-controller.cpp --- src/obs-controller.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/obs-controller.cpp b/src/obs-controller.cpp index b8a0aecc..b01eddbb 100644 --- a/src/obs-controller.cpp +++ b/src/obs-controller.cpp @@ -131,7 +131,7 @@ void TransitionToProgram(MidiHook *hook) } (obs_frontend_preview_program_mode_active()) ? obs_frontend_preview_program_trigger_transition() : SetCurrentScene(hook); - state()._CurrentTransition = QString(obs_source_get_name(transition)); + state()._CurrentTransition = QString( obs_source_get_name(transition)); obs_source_release(transition); } @@ -589,4 +589,4 @@ void make_opacity_filter(MidiHook *hook) obs_scene_t *scene = Utils::GetSceneFromNameOrCurrent(hook->scene); obs_sceneitem_t *item = Utils::GetSceneItemFromName(scene, hook->source); (obs_sceneitem_visible(item)) ? fade_out_scene_item(hook) : fade_in_scene_item(hook); -} \ No newline at end of file +} From 3cbab908d35332fe658f497db3b7ffe34e3f87e4 Mon Sep 17 00:00:00 2001 From: Christopher P Yarger Date: Sat, 20 Mar 2021 16:00:31 -0400 Subject: [PATCH 2/3] Update CI Build and release.yml --- .github/workflows/CI Build and release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI Build and release.yml b/.github/workflows/CI Build and release.yml index 4a98ccd3..117000b1 100644 --- a/.github/workflows/CI Build and release.yml +++ b/.github/workflows/CI Build and release.yml @@ -504,8 +504,9 @@ jobs: if: success() shell: bash run: | - curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg - sudo installer -pkg ${{ github.workspace }}/Packages.pkg -target / + curl -L -O http://s.sudre.free.fr/Software/files/Packages.dmg + sudo hdiutil attach ./Packages.dmg + sudo installer -pkg /Volumes/Packages\ 1.2.9/Install\ Packages.pkg -target / - name: 'Set release filename' if: success() shell: bash From 12f0d2c89e2c1a6a86a48f762352cd6ccab87442 Mon Sep 17 00:00:00 2001 From: robrob2142 Date: Sat, 6 Aug 2022 20:50:44 +0200 Subject: [PATCH 3/3] fixed programm changes --- src/Midi_message.cpp | 4 ++-- src/obs-midi.h | 4 ++-- src/version.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Midi_message.cpp b/src/Midi_message.cpp index 32fff0c5..7338e2d5 100644 --- a/src/Midi_message.cpp +++ b/src/Midi_message.cpp @@ -20,6 +20,7 @@ int MidiMessage::get_midi_note_or_control(const libremidi::message &mess) case libremidi::message_type::POLY_PRESSURE: break; case libremidi::message_type::PROGRAM_CHANGE: + bytetopullfrom = 1; break; case libremidi::message_type::AFTERTOUCH: break; @@ -77,8 +78,7 @@ int MidiMessage::get_midi_value(const libremidi::message &mess) bytetopullfrom = 2; break; case libremidi::message_type::PROGRAM_CHANGE: - bytetopullfrom = 1; - break; + return 0xFF; case libremidi::message_type::POLY_PRESSURE: break; case libremidi::message_type::AFTERTOUCH: diff --git a/src/obs-midi.h b/src/obs-midi.h index bc6a81ae..f0eed9dd 100644 --- a/src/obs-midi.h +++ b/src/obs-midi.h @@ -11,13 +11,13 @@ void ___sceneitem_dummy_addref(obs_sceneitem_t *); void ___data_dummy_addref(obs_data_t *); void ___data_array_dummy_addref(obs_data_array_t *); void ___output_dummy_addref(obs_output_t *); - +#if false using OBSSourceAutoRelease = OBSRef; using OBSSceneItemAutoRelease = OBSRef; using OBSDataAutoRelease = OBSRef; using OBSDataArrayAutoRelease = OBSRef; using OBSOutputAutoRelease = OBSRef; - +#endif void ___data_item_dummy_addref(obs_data_item_t *); void ___data_item_release(obs_data_item_t *); using OBSDataItemAutoRelease = OBSRef; diff --git a/src/version.h b/src/version.h index edb4a5c9..dd05f33a 100644 --- a/src/version.h +++ b/src/version.h @@ -1,7 +1,7 @@ #ifndef VERSION_H #define VERSION_H -#define GIT_TAG "tag-0.9.3-ALPHA-3.19" +#define GIT_TAG "tag-0.9.3-ALPHA-3.66" #endif