RageStudio/comty
1
0
Fork 0
mirror of https://github.com/ragestudio/comty.git synced 2025-06-09 18:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ragestudio/comty

Browse Source
This commit is contained in:
srgooglo 2022-05-13 14:56:35 +02:00
commit d5d90a01a1
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/app/constants/defaultRemotesOrigins.json
View File

@ -1,5 +1,5 @@
{ {
"main_api": "https://indev_api.comty.pw", "main_api": "http://localhost:3000",
"streaming_api": "http://media.ragestudio.net:3002", "streaming_api": "http://localhost:3002",
"websocket_api": "wss://indev_ws.comty.pw" "websocket_api": "ws://localhost:3001"
} }

7
packages/streaming-server/src/index.js
View File

@ -30,8 +30,15 @@ const MediaServerConfig = {
ping: 30, ping: 30,
ping_timeout: 60 ping_timeout: 60
}, },
<<<<<<< HEAD
//logType: 0, //logType: 0,
mediaroot: path.resolve(process.cwd(), "./cache"), mediaroot: path.resolve(process.cwd(), "./cache"),
=======
http: {
port: 1000,
allow_origin: "*"
},
>>>>>>> c11505bacf345ac8b0e7799a04f90daa6922556a
trans: { trans: {
ffmpeg: ffmpeg.path, ffmpeg: ffmpeg.path,
tasks: [ tasks: [

1
packages/streaming-server/src/nms Submodule

@ -0,0 +1 @@
Subproject commit 219ca691fda874c94712e4ba86a023948940409d