use IDs for multiple decoders

app/decoder/probeserver.cpp

@@ -26,6 +26,22 @@
 
 #include "decoder/ffmpeg/ffmpegdecoder.h"
 
+QVector<Decoder*> ReceiveListOfAllDecoders() {
+  QVector<Decoder*> decoders;
+
+  decoders.append(new FFmpegDecoder());
+
+  return decoders;
+}
+
+void FreeListOfDecoders(const QVector<Decoder*>& decoders, Decoder* except = nullptr) {
+  foreach (Decoder* d, decoders) {
+    if (except == nullptr || except != d) {
+      delete d;
+    }
+  }
+}
+
 bool olive::ProbeMedia(Footage *f)
 {
   // Check for a valid filename
@@ -43,27 +59,61 @@ bool olive::ProbeMedia(Footage *f)
   // Reset Footage state for probing
   f->Clear();
 
-  // Create decoder instance
-  FFmpegDecoder ff_dec;
-
   // Create list to iterate through
-  QList<Decoder*> decoder_list;
-  decoder_list.append(&ff_dec);
+  QVector<Decoder*> decoder_list = ReceiveListOfAllDecoders();
+
+  Decoder* found_decoder = nullptr;
 
   // Pass Footage through each Decoder's probe function
   for (int i=0;i<decoder_list.size();i++) {
-    if (decoder_list.at(i)->Probe(f)) {
 
-      // FIXME Some way of "attaching" the Footage to the Decoder without having to iterate through Decoders again at
-      // render time?
+    Decoder* decoder = decoder_list.at(i);
 
-      f->set_status(Footage::kReady);
-      return true;
+    if (decoder->Probe(f)) {
+
+      // FIXME: Cache the results so we don't have to probe if this media is added a second time
+
+      found_decoder = decoder;
+      break;
     }
   }
 
-  // We aren't able to use this Footage
-  f->set_status(Footage::kInvalid);
+  if (found_decoder == nullptr) {
+    // We aren't able to use this Footage
+    f->set_status(Footage::kInvalid);
+    f->set_decoder(QString());
+  } else {
+    // We found a Decoder, so we can set this media as valid
+    f->set_status(Footage::kReady);
 
-  return false;
+    // Attach the successful Decoder to this Footage object
+    f->set_decoder(found_decoder->id());
+  }
+
+  FreeListOfDecoders(decoder_list);
+
+  return (found_decoder != nullptr);
+}
+
+Decoder* olive::CreateDecoderFromID(const QString &id)
+{
+  if (id.isEmpty()) {
+    return nullptr;
+  }
+
+  // Create list to iterate through
+  QVector<Decoder*> decoder_list = ReceiveListOfAllDecoders();
+
+  Decoder* found_decoder = nullptr;
+
+  foreach (Decoder* d, decoder_list) {
+    if (d->id() == id) {
+      found_decoder = d;
+      break;
+    }
+  }
+
+  FreeListOfDecoders(decoder_list, found_decoder);
+
+  return found_decoder;
 }