restored audio functionality

app/node/globals.h

@@ -24,6 +24,7 @@
 #include <QVector2D>
 
 #include "common/timerange.h"
+#include "render/audioparams.h"
 #include "render/videoparams.h"
 
 namespace olive {
@@ -33,19 +34,22 @@ class NodeGlobals
 public:
   NodeGlobals(){}
 
-  NodeGlobals(const VideoParams &vparam, const TimeRange &time) :
+  NodeGlobals(const VideoParams &vparam, const AudioParams &aparam, const TimeRange &time) :
     video_params_(vparam),
+    audio_params_(aparam),
     time_(time)
   {
   }
 
   QVector2D square_resolution() const { return video_params_.square_resolution(); }
   QVector2D nonsquare_resolution() const { return video_params_.resolution(); }
+  const AudioParams &aparams() const { return audio_params_; }
   const VideoParams &vparams() const { return video_params_; }
   const TimeRange &time() const { return time_; }
 
 private:
   VideoParams video_params_;
+  AudioParams audio_params_;
   TimeRange time_;
 
 };

app/node/output/track/track.cpp

@@ -116,7 +116,7 @@ Node::ActiveElements Track::GetActiveElementsAtTime(const QString &input, const
       ActiveElements a;
       for (int i=start; i<=end; i++) {
         Block *b = blocks_.at(i);
-        if (b->is_enabled()) {
+        if (b->is_enabled() && (dynamic_cast<ClipBlock*>(b) || dynamic_cast<TransitionBlock*>(b))) {
           a.add(GetArrayIndexFromCacheIndex(i));
         }
       }
@@ -142,7 +142,7 @@ void Track::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeVal
     }
   } else if (this->type() == Track::kAudio) {
     // Audio
-    ProcessAudioTrack(table, globals.time());
+    ProcessAudioTrack(value, globals, table);
   }
 }
 
@@ -603,27 +603,28 @@ int Track::GetBlockIndexAtTime(const rational &time) const
   return -1;
 }
 
-void Track::ProcessAudioTrack(NodeValueTable *table, const TimeRange &range) const
+void Track::ProcessAudioTrack(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
 {
-  /*
+  const TimeRange &range = globals.time();
+
   // All these blocks will need to output to a buffer so we create one here
-  SampleBuffer block_range_buffer(audio_params, range.length());
+  SampleBuffer block_range_buffer(globals.aparams(), range.length());
   block_range_buffer.silence();
 
-  NodeValueTable merged_table;
-
   // Loop through active blocks retrieving their audio
-  foreach (Block* b, active_blocks) {
-    if (dynamic_cast<ClipBlock*>(b) || dynamic_cast<TransitionBlock*>(b)) {
+  NodeValueArray arr = value[kBlockInput].toArray();
+
+  for (auto it=arr.cbegin(); it!=arr.cend(); it++) {
+    Block *b = blocks_.at(GetCacheIndexFromArrayIndex(it->first));
+
     TimeRange range_for_block(qMax(b->in(), range.in()),
                               qMin(b->out(), range.out()));
 
-      qint64 destination_offset = audio_params.time_to_samples(range_for_block.in() - range.in());
-      qint64 max_dest_sz = audio_params.time_to_samples(range_for_block.length());
+    qint64 destination_offset = globals.aparams().time_to_samples(range_for_block.in() - range.in());
+    qint64 max_dest_sz = globals.aparams().time_to_samples(range_for_block.length());
 
     // Destination buffer
-      NodeValueTable table = GenerateTable(b, Track::TransformRangeForBlock(b, range_for_block));
-      SampleBuffer samples_from_this_block = table.Take(NodeValue::kSamples).toSamples();
+    SampleBuffer samples_from_this_block = it->second.toSamples();
     ClipBlock *clip_cast = dynamic_cast<ClipBlock*>(b);
 
     if (samples_from_this_block.is_allocated()) {
@@ -689,14 +690,10 @@ void Track::ProcessAudioTrack(NodeValueTable *table, const TimeRange &range) con
       for (int i=0; i<samples_from_this_block.audio_params().channel_count(); i++) {
         block_range_buffer.set(i, samples_from_this_block.data(i), destination_offset, copy_length);
       }
-
-        NodeValueTable::Merge({merged_table, table});
-      }
     }
   }
 
   table->Push(NodeValue::kSamples, QVariant::fromValue(block_range_buffer), this);
-  */
 }
 
 void Track::BlockLengthChanged()

app/node/output/track/track.h

@@ -453,7 +453,7 @@ private:
 
   int GetBlockIndexAtTime(const rational &time) const;
 
-  void ProcessAudioTrack(NodeValueTable *table, const TimeRange &range) const;
+  void ProcessAudioTrack(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const;
 
   TimeRangeList block_length_pending_invalidations_;
 

app/node/traverser.cpp

@@ -179,9 +179,9 @@ void NodeTraverser::Transform(QTransform *transform, const Node *start, const No
   transform_ = nullptr;
 }
 
-NodeGlobals NodeTraverser::GenerateGlobals(const VideoParams &params, const TimeRange &time)
+NodeGlobals NodeTraverser::GenerateGlobals(const VideoParams &vparams, const AudioParams &aparams, const TimeRange &time)
 {
-  return NodeGlobals(params, time);
+  return NodeGlobals(vparams, aparams, time);
 }
 
 NodeValueTable NodeTraverser::ProcessInput(const Node* node, const QString& input, const TimeRange& range)
@@ -304,7 +304,7 @@ NodeValueTable NodeTraverser::GenerateTable(const Node *n, const TimeRange& rang
     table = database.Merge();
 
     // By this point, the node should have all the inputs it needs to render correctly
-    NodeGlobals globals = GenerateGlobals(video_params_, range);
+    NodeGlobals globals = GenerateGlobals(video_params_, audio_params_, range);
     n->Value(row, globals, &table);
 
     // `transform_now_` is the next node in the path that needs to be traversed. It only ever goes

app/node/traverser.h

@@ -54,10 +54,10 @@ public:
 
   void Transform(QTransform *transform, const Node *start, const Node *end, const TimeRange &range);
 
-  static NodeGlobals GenerateGlobals(const VideoParams &params, const TimeRange &time);
-  static NodeGlobals GenerateGlobals(const VideoParams &params, const rational &time)
+  static NodeGlobals GenerateGlobals(const VideoParams &vparams, const AudioParams &aparams, const TimeRange &time);
+  static NodeGlobals GenerateGlobals(const VideoParams &vparams, const AudioParams &aparams, const rational &time)
   {
-    return GenerateGlobals(params, TimeRange(time, time + params.frame_rate_as_time_base()));
+    return GenerateGlobals(vparams, aparams, TimeRange(time, time + vparams.frame_rate_as_time_base()));
   }
 
   const VideoParams& GetCacheVideoParams() const

app/widget/viewer/viewer.cpp

@@ -1678,7 +1678,13 @@ void ViewerWidget::UpdateRendererVideoParameters()
 
 void ViewerWidget::UpdateRendererAudioParameters()
 {
+  AudioParams ap = GetConnectedNode()->GetAudioParams();
+
   UpdateAudioProcessor();
+
+  foreach (ViewerDisplayWidget *dw, playback_devices_) {
+    dw->SetAudioParams(ap);
+  }
 }
 
 void ViewerWidget::SetZoomFromMenu(QAction *action)

app/widget/viewer/viewerdisplay.cpp

@@ -191,6 +191,15 @@ void ViewerDisplayWidget::SetVideoParams(const VideoParams &params)
   }
 }
 
+void ViewerDisplayWidget::SetAudioParams(const AudioParams &params)
+{
+  gizmo_audio_params_ = params;
+
+  if (gizmos_) {
+    update();
+  }
+}
+
 void ViewerDisplayWidget::SetTime(const rational &time)
 {
   time_ = time;
@@ -437,7 +446,7 @@ void ViewerDisplayWidget::OnPaint()
 
     p.setWorldTransform(gizmo_last_draw_transform_);
 
-    gizmos_->UpdateGizmoPositions(gizmo_db_, NodeTraverser::GenerateGlobals(gizmo_params_, gizmo_draw_time_));
+    gizmos_->UpdateGizmoPositions(gizmo_db_, NodeTraverser::GenerateGlobals(gizmo_params_, gizmo_audio_params_, gizmo_draw_time_));
     foreach (NodeGizmo *gizmo, gizmos_->GetGizmos()) {
       if (gizmo->IsVisible()) {
         gizmo->Draw(&p);
@@ -813,7 +822,7 @@ bool ViewerDisplayWidget::OnMousePress(QMouseEvent *event)
       // Handle gizmo click
       gizmo_start_drag_ = event->pos();
       gizmo_last_drag_ = gizmo_start_drag_;
-      current_gizmo_->SetGlobals(NodeTraverser::GenerateGlobals(gizmo_params_, GenerateGizmoTime()));
+      current_gizmo_->SetGlobals(NodeTraverser::GenerateGlobals(gizmo_params_, gizmo_audio_params_, GenerateGizmoTime()));
 
     } else {
 

app/widget/viewer/viewerdisplay.h

@@ -74,8 +74,13 @@ public:
   void SetSafeMargins(const ViewerSafeMarginInfo& safe_margin);
 
   void SetGizmos(Node* node);
+
   const VideoParams &GetVideoParams() const { return gizmo_params_; }
   void SetVideoParams(const VideoParams &params);
+
+  const AudioParams &GetAudioParams() const { return gizmo_audio_params_; }
+  void SetAudioParams(const AudioParams &p);
+
   void SetTime(const rational& time);
   void SetSubtitleTracks(Sequence *list);
 
@@ -343,6 +348,7 @@ private:
   Node* gizmos_;
   NodeValueRow gizmo_db_;
   VideoParams gizmo_params_;
+  AudioParams gizmo_audio_params_;
   QPoint gizmo_start_drag_;
   QPoint gizmo_last_drag_;
   TimeRange gizmo_draw_time_;