Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

obs-studio
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

8bfa7398

Commit 8bfa7398 authored 10 years ago by Jim

Downloads
- Plain Diff

Merge pull request #265 from kc5nra/interaction

Add interaction support to libobs and support for pumping the events/interaction in gui

parents 62ee66d1 42211347

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

libobs/CMakeLists.txt 1 addition, 0 deletions

libobs/CMakeLists.txt
libobs/obs-interaction.h 56 additions, 0 deletions

libobs/obs-interaction.h
libobs/obs-source.c 70 additions, 0 deletions

libobs/obs-source.c
libobs/obs-source.h 62 additions, 0 deletions

libobs/obs-source.h
libobs/obs.h 22 additions, 0 deletions

libobs/obs.h
obs/CMakeLists.txt 3 additions, 0 deletions

obs/CMakeLists.txt
obs/data/locale/en-US.ini 3 additions, 0 deletions

obs/data/locale/en-US.ini
obs/forms/OBSBasic.ui 5 additions, 0 deletions

obs/forms/OBSBasic.ui
obs/forms/OBSBasicInteraction.ui 48 additions, 0 deletions

obs/forms/OBSBasicInteraction.ui
obs/window-basic-interaction.cpp 391 additions, 0 deletions

obs/window-basic-interaction.cpp
obs/window-basic-interaction.hpp 90 additions, 0 deletions

obs/window-basic-interaction.hpp
obs/window-basic-main.cpp 39 additions, 2 deletions

obs/window-basic-main.cpp
obs/window-basic-main.hpp 5 additions, 0 deletions

obs/window-basic-main.hpp

with 795 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment