cache: improved code flow

app/node/output/viewer/viewer.cpp

@@ -31,7 +31,7 @@ const QString ViewerOutput::kVideoParamsInput = QStringLiteral("video_param_in")
 const QString ViewerOutput::kAudioParamsInput = QStringLiteral("audio_param_in");
 const QString ViewerOutput::kTextureInput = QStringLiteral("tex_in");
 const QString ViewerOutput::kSamplesInput = QStringLiteral("samples_in");
-const QString ViewerOutput::kAutoCacheInput = QStringLiteral("autocache_in");
+const QString ViewerOutput::kVideoAutoCacheInput = QStringLiteral("autocache_in");
 
 const uint64_t ViewerOutput::kVideoParamEditMask = VideoParamEdit::kWidthHeight | VideoParamEdit::kInterlacing | VideoParamEdit::kFrameRate | VideoParamEdit::kPixelAspect;
 
@@ -55,9 +55,9 @@ ViewerOutput::ViewerOutput(bool create_buffer_inputs, bool create_default_stream
     AddInput(kTextureInput, NodeValue::kTexture, InputFlags(kInputFlagNotKeyframable));
     AddInput(kSamplesInput, NodeValue::kSamples, InputFlags(kInputFlagNotKeyframable));
 
-    AddInput(kAutoCacheInput, NodeValue::kBoolean, true, InputFlags(kInputFlagNotKeyframable | kInputFlagNotConnectable));
-    IgnoreHashingFrom(kAutoCacheInput);
-    IgnoreInvalidationsFrom(kAutoCacheInput);
+    AddInput(kVideoAutoCacheInput, NodeValue::kBoolean, true, InputFlags(kInputFlagNotKeyframable | kInputFlagNotConnectable));
+    IgnoreHashingFrom(kVideoAutoCacheInput);
+    IgnoreInvalidationsFrom(kVideoAutoCacheInput);
   }
 
   if (create_default_streams) {
@@ -202,7 +202,7 @@ void ViewerOutput::set_default_parameters()
       AudioParams::kInternalFormat
       ));
 
-  SetAutoCacheEnabled(Config::Current()["DefaultSequenceAutoCache"].toBool());
+  SetVideoAutoCacheEnabled(Config::Current()["DefaultSequenceAutoCache"].toBool());
 }
 
 void ViewerOutput::ShiftVideoCache(const rational &from, const rational &to)
@@ -294,8 +294,8 @@ void ViewerOutput::Retranslate()
     SetInputName(kSamplesInput, tr("Samples"));
   }
 
-  if (HasInputWithID(kAutoCacheInput)) {
-    SetInputName(kAutoCacheInput, tr("Auto-Cache"));
+  if (HasInputWithID(kVideoAutoCacheInput)) {
+    SetInputName(kVideoAutoCacheInput, tr("Auto-Cache Video"));
   }
 }
 
@@ -387,8 +387,8 @@ Node::ValueHint ViewerOutput::GetConnectedSampleValueHint()
 
 void ViewerOutput::InputValueChangedEvent(const QString &input, int element)
 {
-  if (input == kAutoCacheInput) {
-    emit AutoCacheChanged(GetAutoCacheEnabled());
+  if (input == kVideoAutoCacheInput) {
+    emit VideoAutoCacheChanged(GetVideoAutoCacheEnabled());
   } else if (element == 0) {
     if (input == kVideoParamsInput) {
 

app/node/output/viewer/viewer.h

@@ -159,19 +159,19 @@ public:
   void SetViewerVideoCacheEnabled(bool e) { video_cache_enabled_ = e; }
   void SetViewerAudioCacheEnabled(bool e) { audio_cache_enabled_ = e; }
 
-  bool GetAutoCacheEnabled() const
+  bool GetVideoAutoCacheEnabled() const
   {
-    if (HasInputWithID(kAutoCacheInput)) {
-      return GetStandardValue(kAutoCacheInput).toBool();
+    if (HasInputWithID(kVideoAutoCacheInput)) {
+      return GetStandardValue(kVideoAutoCacheInput).toBool();
     } else {
       return false;
     }
   }
 
-  void SetAutoCacheEnabled(bool e)
+  void SetVideoAutoCacheEnabled(bool e)
   {
-    if (HasInputWithID(kAutoCacheInput)) {
-      return SetStandardValue(kAutoCacheInput, e);
+    if (HasInputWithID(kVideoAutoCacheInput)) {
+      return SetStandardValue(kVideoAutoCacheInput, e);
     }
   }
 
@@ -181,7 +181,7 @@ public:
   static const QString kTextureInput;
   static const QString kSamplesInput;
 
-  static const QString kAutoCacheInput;
+  static const QString kVideoAutoCacheInput;
 
   static const uint64_t kVideoParamEditMask;
 
@@ -196,7 +196,7 @@ signals:
 
   void InterlacingChanged(VideoParams::Interlacing mode);
 
-  void AutoCacheChanged(bool e);
+  void VideoAutoCacheChanged(bool e);
 
   void VideoParamsChanged();
   void AudioParamsChanged();