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

packages/app/constants/defaultRemotesOrigins.json

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

packages/streaming-server/src/index.js

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

packages/streaming-server/src/nms

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