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

39930b15

Commit 39930b15 authored 10 years ago by Jim

Downloads
- Plain Diff

Merge pull request #141 from jp9000/status-bar

Implement Status bar

parents be2b0d13 f0cc3864

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

build/data/obs-studio/locale/en.txt 5 additions, 0 deletions

build/data/obs-studio/locale/en.txt
libobs/obs-internal.h 2 additions, 0 deletions

libobs/obs-internal.h
libobs/obs-output.c 50 additions, 16 deletions

libobs/obs-output.c
libobs/obs-output.h 4 additions, 0 deletions

libobs/obs-output.h
libobs/obs.h 4 additions, 0 deletions

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

obs/CMakeLists.txt
obs/forms/OBSBasic.ui 6 additions, 1 deletion

obs/forms/OBSBasic.ui
obs/window-basic-main.cpp 11 additions, 0 deletions

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

obs/window-basic-main.hpp
obs/window-basic-status-bar.cpp 214 additions, 0 deletions

obs/window-basic-status-bar.cpp
obs/window-basic-status-bar.hpp 58 additions, 0 deletions

obs/window-basic-status-bar.hpp
plugins/obs-outputs/rtmp-stream.c 31 additions, 3 deletions

plugins/obs-outputs/rtmp-stream.c
vs/2013/obs-studio/obs-studio.vcxproj 27 additions, 0 deletions

vs/2013/obs-studio/obs-studio.vcxproj
vs/2013/obs-studio/obs-studio.vcxproj.filters 12 additions, 0 deletions

vs/2013/obs-studio/obs-studio.vcxproj.filters

with 435 additions and 20 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