noobs 0.0.115 → 0.0.131

package/src/obs_interface.h

@@ -30,37 +30,40 @@ struct PreviewInfo {
   uint32_t displayWidth, displayHeight;
 };
 
+struct SourceSize {
+  uint32_t width;
+  uint32_t height;
+};
+
 class ObsInterface {
   public:
     ObsInterface(
       const std::string& distPath,      // Where to look for plugins and data
       const std::string& logPath,       // Where to write logs to
-      const std::string& recordingPath, // Where to save recordings
       Napi::ThreadSafeFunction cb       // JavaScript callback
     );
 
     ~ObsInterface();
 
-    bool setBuffering(bool buffering); // In buffering mode, the recording is stored in memory and can be converted to a file later.
     void startBuffering(); // Start buffering to memory.
     void startRecording(int offset); // Convert the active buffered recording to a real one.
     void stopRecording(); // Stop the recording.
     void forceStopRecording(); // Force stop the recording, this will not save the current recording.
     std::string getLastRecording(); // Get the last recorded file path.
-    void setRecordingDir(const std::string& recordingPath); // Output must not be active when calling this.
+    void setBuffering(bool buffer); // Enable or disable buffering.
+    void setRecordingDir(const std::string& recordingPath); // Set the recording path.
     void setVideoContext(int fps, int width, int height); // Reset video settings.
 
-    void createSource(std::string name, std::string type); // Create a new source
+    std::string createSource(std::string name, std::string type); // Create a new source, returns the name of the source which can vary from the requested.
     void deleteSource(std::string name); // Release a source.
     obs_data_t* getSourceSettings(std::string name); // Get the current settings.
     void setSourceSettings(std::string name, obs_data_t* settings); // Set settings.
     obs_properties_t* getSourceProperties(std::string name); // Get the settings schema.
     void setMuteAudioInputs(bool mute); // Mute or unmute all audio inputs.
-    void setOutputVolume(float volume);
-    void setInputVolume(float volume); 
-    void setProcessVolume(float volume); 
-
-    void setVolmeterEnabled(bool enabled);
+    void setSourceVolume(std::string name, float volume); // Set the volume of an audio source.
+    void setVolmeterEnabled(bool enabled); // Enable volmeters.
+    void setAudioSuppression(bool enabled); // Enable audio suppression.
+    void setForceMono(bool enabled); // Enable force mono audio.
 
     void addSourceToScene(std::string name); // Add source to scene.
     void removeSourceFromScene(std::string name); // Remove source from scene.
@@ -78,22 +81,22 @@ class ObsInterface {
 
     std::vector<std::string> listAvailableVideoEncoders(); // Return a list of available video encoders.
     void setVideoEncoder(std::string id, obs_data_t* settings); // Set the video encoder to use.
-  
-  private:
-    obs_output_t *file_output = nullptr;
-    obs_output_t *buffer_output = nullptr;
 
-    obs_scene_t *scene = nullptr;
+    std::map<std::string, obs_source_t*> sources; // Map of source names to obs_source_t pointers. 
+    std::map<std::string, SourceSize> sizes; // Map of source names to their last known size, used for firing callbacks on size changes. 
+    std::map<std::string, obs_volmeter_t*> volmeters; // Map of source names to obs_volmeter_t pointers.
+    std::map<std::string, SignalContext*> volmeter_cb_ctx; // Map of volmeter callback contexts.
+    std::map<std::string, obs_source_t*> filters; // Map of source names to obs_source_t filter pointers.
 
-    obs_encoder_t *file_video_encoder = nullptr;
-    obs_encoder_t *file_audio_encoder = nullptr;
+    void sourceCallback(std::string name); // Send callback for source change.
+    void zeroVolmeter(std::string name); // Zero the volmeter for a source.
 
-    obs_encoder_t *buffer_video_encoder = nullptr;
-    obs_encoder_t *buffer_audio_encoder = nullptr;
+  private:
+    obs_output_t *output = nullptr;
+    obs_scene_t *scene = nullptr;
 
-    float output_volume = 1.0f; // Volume for the output.
-    float input_volume = 1.0f; // Volume for the input.
-    float process_volume = 1.0f; // Volume for the process.
+    obs_encoder_t *video_encoder = nullptr;
+    obs_encoder_t *audio_encoder = nullptr;
     
     obs_display_t *display = nullptr;
     HWND preview_hwnd = nullptr; // window handle for scene preview
@@ -103,13 +106,10 @@ class ObsInterface {
 
     bool buffering = false; // Whether we are buffering the recording in memory.
     bool drawSourceOutline = false; // Draw red outline around source
-    std::map<std::string, obs_source_t*> sources; // Map of source names to obs_source_t pointers. 
-    std::map<std::string, obs_volmeter_t*> volmeters; // Map of source names to obs_volmeter_t pointers.
-
     void init_obs(const std::string& distPath);
     int reset_video(int fps, int width, int height);
     bool reset_audio();
-    void load_module(const char* module, const char* data); // Load a module, data is optional.
+    void load_module(const char* module, const char* data, bool allowFail); // Load a module, data is optional.
     void connect_signal_handlers(obs_output_t *output);
     void disconnect_signal_handlers(obs_output_t *output);
 
@@ -127,12 +127,14 @@ class ObsInterface {
     void create_scene();
     void create_output();
 
-    std::string video_encoder_id; // The video encoder ID to use.
-    obs_data_t* video_encoder_settings; // Settings for the video encoder.
+    std::string video_encoder_id = "obs_x264"; // The video encoder ID to use.
+    obs_data_t* video_encoder_settings = obs_data_create(); // Settings for the video encoder.
     void create_video_encoders();
     void create_audio_encoders();
 
     bool volmeter_enabled = false; // Whether the volmeter callback is enabled.
+    bool audio_suppression = false; // Whether audio suppression is enabled.
+    bool force_mono = false; // Whether force mono audio is enabled.
 
     static void volmeter_callback(
       void *data,