developed beginnings of media node

app/node/input/CMakeLists.txt

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-add_subdirectory(image)
+add_subdirectory(media)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}

app/node/input/media/CMakeLists.txt

@@ -16,7 +16,7 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  node/input/image/image.h
-  node/input/image/image.cpp
+  node/input/media/media.h
+  node/input/media/media.cpp
   PARENT_SCOPE
 )

app/node/input/media/media.cpp

@@ -1,39 +1,43 @@
-#include "image.h"
+#include "media.h"
 
-ImageInput::ImageInput() :
+MediaInput::MediaInput() :
   texture_(nullptr)
 {
+  footage_input_ = new NodeInput();
+  footage_input_->add_data_input(NodeInput::kFootage);
+  AddParameter(footage_input_);
+
   texture_output_ = new NodeOutput();
   texture_output_->set_data_type(NodeOutput::kTexture);
   AddParameter(texture_output_);
 }
 
-QString ImageInput::Name()
+QString MediaInput::Name()
 {
-  return tr("Image");
+  return tr("Media");
 }
 
-QString ImageInput::id()
+QString MediaInput::id()
 {
-  return "org.olivevideoeditor.Olive.imageinput";
+  return "org.olivevideoeditor.Olive.mediainput";
 }
 
-QString ImageInput::Category()
+QString MediaInput::Category()
 {
   return tr("Input");
 }
 
-QString ImageInput::Description()
+QString MediaInput::Description()
 {
-  return tr("Import an image file.");
+  return tr("Import a footage stream.");
 }
 
-NodeOutput *ImageInput::texture_output()
+NodeOutput *MediaInput::texture_output()
 {
   return texture_output_;
 }
 
-void ImageInput::Process(const rational &time)
+void MediaInput::Process(const rational &time)
 {
   // FIXME: Use OIIO and OCIO here
 

app/node/input/media/media.h

@@ -11,11 +11,11 @@
  * FIXME: This will likely be replaced by the Media node as the Media node will be set up to pull from various decoders
  *        from the beginning.
  */
-class ImageInput : public Node
+class MediaInput : public Node
 {
   Q_OBJECT
 public:
-  ImageInput();
+  MediaInput();
 
   virtual QString Name() override;
   virtual QString id() override;
@@ -28,6 +28,8 @@ public slots:
   virtual void Process(const rational &time) override;
 
 private:
+  NodeInput* footage_input_;
+
   NodeOutput* texture_output_;
 
   QOpenGLTexture* texture_;