Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,598 Commits 6 Branches 45 Tags
Commit Graph

92 Commits

Author SHA1 Message Date
tt2468
ea8f14e41b Base: Update files for compat release 2022-01-03 16:26:42 -08:00
tt2468
9a8d283d27 base: Update plugin version to 4.9.1 2021-06-09 21:03:59 -07:00
tt2468
a469fc539a
Merge pull request #708 from Meetsch/feature/virtualcam 
Requests: support for new virtualcam related obs-frontend-api in upcoming OBS-Studio 27.0
 2021-06-01 17:19:32 -07:00
Stéphane Lepin
ba93b05efa cmake: fix frontend api message + nitpicks 2021-04-18 23:29:20 +02:00
Stéphane Lepin
d154e77299 Merge branch '4.x-current' into bugfix/cmake-frontend-lib 2021-04-18 23:25:44 +02:00
Stéphane Lepin
2f8073d548
Merge pull request #702 from Palakis/fix/imageformats 
CMake: Copy other imageformats plugins too.
 2021-04-18 23:15:33 +02:00
Stéphane Lepin
1f0c1691be cmake: simplify package step 2021-04-18 23:00:26 +02:00
Stéphane Lepin
50eedd11e0 cmake: fix target directory path of QImage plugins 2021-04-18 22:56:09 +02:00
ZyanKLee
30af0cbd9a
allow inline build with obs-studio 
when replacing CMAKE_SOURCE_DIR with CMAKE_CURRENT_SOURCE_DIR in the CMakeLists.txt this should allow for building the plugin directly inside of obs-studio as well as separately
 2021-03-29 10:06:08 +02:00
tt2468
7556c5f855 CMake: Copy other imageformats plugins too. 2021-03-19 01:45:52 -07:00
Michel Bagnol
8c4374825d [fix] Missing events for virtualcam 2021-03-18 17:43:17 +01:00
Michel Bagnol
c22199b8eb [feature] support for VirtualCam 2021-03-18 16:51:27 +01:00
tt2468
8d034f53a4 Chore: Bump version to 4.9.0 2021-02-04 07:47:36 -08:00
Stéphane Lepin
501e0f63f5 ci(linux): fix deb package file permissions 2020-12-19 22:54:46 -08:00
venepe
58448f363b CMakeLists: Compile for arm targets 2020-07-18 13:48:52 -05:00
tt2468
72997eaa85 Merge branch '4.x-current' into category-mediacontrol 2020-05-16 12:08:28 -07:00
tt2468
f9c81f99f2
Install into both dirs on Ubuntu instead of only one 2020-05-12 02:24:27 -07:00
tt2468
1c6670c9b0 Create new category and add MediaPlayPause request 2020-05-10 21:03:38 -07:00
tt2468
47492c3fa2
Implement fix for Ubuntu users 
#478 Broke building on linux. This implements a new variable to apply the fix.
 2020-04-30 09:46:22 -07:00
Stéphane Lepin
b2d39ab2d7 cmake(linux): include GNUInstallDirs 2020-04-28 09:52:11 +02:00
Stéphane Lepin
5843521cf1 cmake(linux): use the standard LIBDIR and DATAROOTDIR install locations 2020-04-28 09:46:45 +02:00
Stéphane Lepin
f7512c3cc0 cmake(msvc): disable FH4 2020-04-06 19:40:04 +02:00
Stéphane Lepin
f4997375e9 cmake: add version + fix /MP msvc flag 2020-04-06 19:09:01 +02:00
Stéphane Lepin
f23ba0c513 Merge branch '4.x-current' into bugfix/crash-get-streaming-time 2020-03-28 19:17:53 +01:00
Stéphane Lepin
824cfd4871 Merge branch '4.x-current' into bugfix/cmake-frontend-lib 2020-03-28 19:17:19 +01:00
Stéphane Lepin
6a733bbb13
Migrate Windows & Linux builds to Azure Pipelines (#422) 2020-03-28 19:13:55 +01:00
Stéphane Lepin
c418cbf4ef cmake(windows): fix qjpeg path 2020-03-17 20:08:46 +01:00
Stéphane Lepin
3450c6b9a3 cmake(windows): copy qjpeg on RelWithDebInfo as well 2020-03-17 19:52:49 +01:00
Stéphane Lepin
a669852694 cmake(windows): oops, fix copy command 2020-03-17 19:37:39 +01:00
Stéphane Lepin
a5b6ea6c4c cmake(windows): copy qt image format plugins 2020-03-17 19:34:53 +01:00
Stéphane Lepin
f2f5661625 cmake: fix redundant c++ standard flag 2020-02-25 15:32:47 +01:00
Stéphane Lepin
a0dce77a2f RpcEvent: streamTime and recordingTime are optional 2020-02-25 15:23:24 +01:00
Stéphane Lepin
46068573c5 events: decouple events encoding from event emit 2020-01-28 18:37:25 +01:00
Stéphane Lepin
d25b65c124 RpcResponse: fixes 2019-11-15 22:59:36 +01:00
Stéphane Lepin
5864864123 WSServer: reimplement protocol 2019-11-15 21:07:58 +01:00
Stéphane Lepin
bdf1023b16 handler: request and response types 2019-11-15 19:26:42 +01:00
Stéphane
a5bc979c24 cmake: fix set of OBS_FRONTEND_LIB 2019-06-23 22:58:45 +02:00
Stéphane Lepin
2b746d1353 cmake: add output requests 2019-06-11 19:32:52 +02:00
Stéphane L
83382d8dcf general: remove boost remains 2019-05-11 17:13:41 +02:00
Stéphane Lepin
bb9cf83744 server: dedicated ConnectionProperties object 2019-05-02 13:06:10 +02:00
Stéphane Lepin
f2a9ff8551 ci(linux): fix Ubuntu package 2019-03-22 01:40:29 +01:00
Stéphane Lepin
16bc68f2f9 server: import websockets++ server from master 2018-12-31 17:05:23 +01:00
Stéphane L
edc64b8336 auth: get rid of mbedtls 2018-11-08 00:52:26 +01:00
Stéphane Lepin
454a68d1b7
Merge pull request #199 from Palakis/4.3-jimtree-studiomode-fix 
[not ready] events: fix triggering of PreviewSceneChanged
 2018-07-29 17:01:48 +02:00
Stéphane L
45f6f74cbe cmake: remove copy operation 2018-07-21 23:05:38 +02:00
Stéphane L
cb7412a457 events: fix triggering of PreviewSceneChanged 2018-07-08 12:58:06 +02:00
Stéphane L
cd40ccdb9d Merge pull request #211 from wherget/build-fixes 
MacOS Build fixes
 2018-05-27 18:38:39 +02:00
RytoEX
25210dfa52 CI and CMake improvements (#205) 
* CMake: Copy PDB file to OBS build directory on Debug build

All native OBS build objects also bundle the associated PDB file for
debugging and handling crash reports.

* CMake: Add post-build commands for RelWithDebInfo

Add post-build commands for the RelWithDebInfo build config. OBS
official builds use RelWithDebInfo, so we should be able to treat it as
a release config.

* CI: Disable building OBS native plugins

Use the OBS CMake flag DISABLE_PLUGINS to disable building plugins
included with OBS (including submodule plugins like obs-browser). This
should speed up builds on Windows when we have to rebuild OBS and on
Mac.

* CI: Don't clone/update OBS submodules

The only submodules presently in OBS are in its plugins, which we don't
need to build.

* CI: Use obsproject/obs-studio instead of jp9000/obs-studio

The OBS GitHub recently changed from jp9000/obs-studio to
obsproject/obs-studio, so use that instead.

* CI: Build as RelWithDebInfo instead of Release

OBS official builds are produced with RelWithDebInfo. This will produce
a PDB file for the plugin, similar to the native OBS plugins.

* CI(Windows): Build OBS if current build config doesn't exist

If OBS libs for the current build config do not exist, build OBS before
building obs-websocket.
 2018-03-26 11:12:39 +02:00
Stéphane Lepin
0a50e2a95c ci(linux): use OBS dev deps from PPA release 2018-03-20 14:11:33 +01:00
Palakis
7e5716185e code: reorder and refactor WSRequestHandlers 2017-11-14 09:14:33 +01:00