Skip to content
Snippets Groups Projects

Audio mixer GUI and more vectorisation

Merged Nicolas Pope requested to merge feature/audio-vectorvol into master
18 files
+ 169
51
Compare changes
  • Side-by-side
  • Inline
Files
18
@@ -3,6 +3,7 @@
@@ -3,6 +3,7 @@
#include "../views/camera3d.hpp"
#include "../views/camera3d.hpp"
#include <ftl/rgbd/capabilities.hpp>
#include <ftl/rgbd/capabilities.hpp>
 
#include <ftl/streams/renderer.hpp>
#include <chrono>
#include <chrono>
#include <opencv2/imgproc.hpp>
#include <opencv2/imgproc.hpp>
@@ -330,6 +331,18 @@ std::string Camera::getActiveSourceURI() {
@@ -330,6 +331,18 @@ std::string Camera::getActiveSourceURI() {
return "";
return "";
}
}
 
ftl::audio::StereoMixerF<100> *Camera::mixer() {
 
if (mixer_) return mixer_;
 
if (movable_) {
 
auto *rend = io->feed()->getRenderer(frame_id_);
 
if (rend) {
 
mixer_ = &(rend->mixer());
 
return mixer_;
 
}
 
}
 
return nullptr;
 
}
 
bool Camera::isRecording() {
bool Camera::isRecording() {
return io->feed()->isRecording();
return io->feed()->isRecording();
}
}
Loading