Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct programm change #192

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Correct programm change #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7573d34
Update obs-controller.cpp
cpyarger Mar 20, 2021
3cbab90
Update CI Build and release.yml
cpyarger Mar 20, 2021
12f0d2c
fixed programm changes
robrob2142 Aug 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/CI Build and release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Midi_message.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/obs-controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
}
4 changes: 2 additions & 2 deletions src/obs-midi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<obs_source_t *, ___source_dummy_addref, obs_source_release>;
using OBSSceneItemAutoRelease = OBSRef<obs_sceneitem_t *, ___sceneitem_dummy_addref, obs_sceneitem_release>;
using OBSDataAutoRelease = OBSRef<obs_data_t *, ___data_dummy_addref, obs_data_release>;
using OBSDataArrayAutoRelease = OBSRef<obs_data_array_t *, ___data_array_dummy_addref, obs_data_array_release>;
using OBSOutputAutoRelease = OBSRef<obs_output_t *, ___output_dummy_addref, obs_output_release>;

#endif
void ___data_item_dummy_addref(obs_data_item_t *);
void ___data_item_release(obs_data_item_t *);
using OBSDataItemAutoRelease = OBSRef<obs_data_item_t *, ___data_item_dummy_addref, ___data_item_release>;
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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