merged probe functions into decoder class

2019-08-08 17:22:26 +10:00
parent c6dfab4caf
commit 6833b18829
8 changed files with 141 additions and 187 deletions
@@ -22,7 +22,7 @@

 #include <QFileInfo>

-#include "decoder/probeserver.h"
+#include "decoder/decoder.h"

 ProbeTask::ProbeTask(FootagePtr footage) :
  footage_(footage)
@@ -36,7 +36,7 @@ bool ProbeTask::Action()
 {
  footage_->Lock();

-  olive::ProbeMedia(footage_.get());
+  Decoder::ProbeMedia(footage_.get());

  footage_->Unlock();