Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions include/flucoma/clients/nrt/DataSetQueryClient.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,19 @@ namespace fluid {
namespace client {
namespace datasetquery {

enum { kName };

constexpr auto DataSetQueryParams = defineParameters();

class DataSetQueryClient : public FluidBaseClient, OfflineIn, OfflineOut
class DataSetQueryClient : public FluidBaseClient,
OfflineIn,
OfflineOut,
ModelObject
{
public:
using string = std::string;
using DataSet = FluidDataSet<string, double, 1>;

template <typename T>
Result process(FluidContext&)
{
return {};
}
{ return {}; }

using ParamDescType = decltype(DataSetQueryParams);
using ParamSetViewType = ParameterSetView<ParamDescType>;
Expand All @@ -41,16 +39,12 @@ class DataSetQueryClient : public FluidBaseClient, OfflineIn, OfflineOut

template <size_t N>
auto& get() const
{
return mParams.get().template get<N>();
}
{ return mParams.get().template get<N>(); }

static constexpr auto& getParameterDescriptors()
{
return DataSetQueryParams;
}
{ return DataSetQueryParams; }

DataSetQueryClient(ParamSetViewType& p, FluidContext&) : mParams(p) {}
DataSetQueryClient(ParamSetViewType& p, FluidContext&) : mParams(p) {}

MessageResult<void> addColumn(index column)
{
Expand Down Expand Up @@ -101,7 +95,7 @@ class DataSetQueryClient : public FluidBaseClient, OfflineIn, OfflineOut


MessageResult<void> transform(InputDataSetClientRef sourceClient,
DataSetClientRef destClient)
DataSetClientRef destClient)
{
if (mAlgorithm.numColumns() <= 0) return Error("No columns");
auto srcPtr = sourceClient.get().lock();
Expand All @@ -120,7 +114,7 @@ class DataSetQueryClient : public FluidBaseClient, OfflineIn, OfflineOut

MessageResult<void> transformJoin(InputDataSetClientRef source1Client,
InputDataSetClientRef source2Client,
DataSetClientRef destClient)
DataSetClientRef destClient)
{
auto src1Ptr = source1Client.get().lock();
auto src2Ptr = source2Client.get().lock();
Expand Down
Loading