cache: better implemented changing disk cache folders

Not complete yet, but getting there.

app/widget/CMakeLists.txt

@@ -33,6 +33,7 @@ add_subdirectory(nodeview)
 add_subdirectory(nodeparamview)
 add_subdirectory(nodetableview)
 add_subdirectory(panel)
+add_subdirectory(path)
 add_subdirectory(pixelsampler)
 add_subdirectory(playbackcontrols)
 add_subdirectory(projectexplorer)

app/widget/path/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  widget/path/pathwidget.h
+  widget/path/pathwidget.cpp
+  PARENT_SCOPE
+)

app/widget/path/pathwidget.cpp

@@ -0,0 +1,68 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "pathwidget.h"
+
+#include <QDir>
+#include <QFileDialog>
+#include <QHBoxLayout>
+
+#include "common/filefunctions.h"
+
+OLIVE_NAMESPACE_ENTER
+
+PathWidget::PathWidget(const QString &path, QWidget *parent) :
+  QWidget(parent)
+{
+  QHBoxLayout* layout = new QHBoxLayout(this);
+  layout->setMargin(0);
+
+  path_edit_ = new QLineEdit();
+  path_edit_->setText(path);
+  layout->addWidget(path_edit_);
+  connect(path_edit_, &QLineEdit::textChanged, this, &PathWidget::LineEditChanged);
+
+  browse_btn_ = new QPushButton(tr("Browse"));
+  layout->addWidget(browse_btn_);
+
+  connect(browse_btn_, &QPushButton::clicked, this, &PathWidget::BrowseClicked);
+}
+
+void PathWidget::BrowseClicked()
+{
+  QString dir = QFileDialog::getExistingDirectory(static_cast<QWidget*>(parent()),
+                                                  tr("Browse for path"),
+                                                  path_edit_->text());
+
+  if (!dir.isEmpty()) {
+    path_edit_->setText(dir);
+  }
+}
+
+void PathWidget::LineEditChanged()
+{
+  if (FileFunctions::DirectoryIsValid(text(), false)) {
+    path_edit_->setStyleSheet(QString());
+  } else {
+    path_edit_->setStyleSheet(QStringLiteral("QLineEdit {color: red;}"));
+  }
+}
+
+OLIVE_NAMESPACE_EXIT

app/widget/path/pathwidget.h

@@ -0,0 +1,57 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef PATHWIDGET_H
+#define PATHWIDGET_H
+
+#include <QLineEdit>
+#include <QPushButton>
+
+#include "common/define.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class PathWidget : public QWidget
+{
+  Q_OBJECT
+public:
+  PathWidget(const QString& path,
+             QWidget* parent = nullptr);
+
+  QString text() const
+  {
+    return path_edit_->text();
+  }
+
+private slots:
+  void BrowseClicked();
+
+  void LineEditChanged();
+
+private:
+  QLineEdit* path_edit_;
+
+  QPushButton* browse_btn_;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // PATHWIDGET_H

app/widget/viewer/viewer.cpp

@@ -361,9 +361,9 @@ void ViewerWidget::SetGizmos(Node *node)
   display_widget_->SetGizmos(node);
 }
 
-FramePtr DecodeCachedImage(const QString &fn, const rational& time)
+FramePtr ViewerWidget::DecodeCachedImage(const QString &fn, const rational& time) const
 {
-  FramePtr frame = FrameHashCache::LoadCacheFrame(fn);
+  FramePtr frame = GetConnectedNode()->video_frame_cache()->LoadCacheFrame(fn);
 
   if (frame) {
     frame->set_timestamp(time);
@@ -374,7 +374,7 @@ FramePtr DecodeCachedImage(const QString &fn, const rational& time)
   return frame;
 }
 
-void DecodeCachedImage(RenderTicketPtr ticket, const QString &fn, const rational& time)
+void ViewerWidget::DecodeCachedImage(RenderTicketPtr ticket, const QString &fn, const rational& time) const
 {
   ticket->Finish(QVariant::fromValue(DecodeCachedImage(fn, time)));
 }
@@ -606,7 +606,7 @@ RenderTicketPtr ViewerWidget::GetFrame(const rational &t, bool clear_render_queu
     // Frame has been cached, grab the frame
     RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeVideo,
                                                             QVariant::fromValue(t));
-    QtConcurrent::run(DecodeCachedImage, ticket, cache_fn, t);
+    QtConcurrent::run(this, &ViewerWidget::DecodeCachedImage, ticket, cache_fn, t);
 
     return ticket;
   }

app/widget/viewer/viewer.h

@@ -204,6 +204,10 @@ private:
 
   void PopOldestFrameFromPlaybackQueue();
 
+  FramePtr DecodeCachedImage(const QString &fn, const rational& time) const;
+
+  void DecodeCachedImage(RenderTicketPtr ticket, const QString &fn, const rational& time) const;
+
   QStackedWidget* stack_;
 
   ViewerSizer* sizer_;