3 files changed, 17 insertions, 1 deletions
diff --git a/libs/mediaScan/include/AbstractMedia.h b/libs/mediaScan/include/AbstractMedia.h
index 6dbf673..f877fb3 100644
--- a/libs/mediaScan/include/AbstractMedia.h
+++ b/libs/mediaScan/include/AbstractMedia.h
@@ -59,6 +59,7 @@ public:
   SupportedMediaType MediaType(void) const { return mediaType; }
   const char *MimeType(void) const { return mimeType; }
   const char *AbsolutePath(void) const;
+  const char *Format(void) const { return format; }
   virtual const char *KeyFile(void) const;
   ulong LastModified(void) const;
   const char *LogicalPath(void) const { return logicalPath; }
@@ -72,15 +73,23 @@ public:
   virtual size_t ReadChunk(char *buf, size_t bufSize);
       ///< used to hide the differences between single- and multi-file media.
   virtual void Reset(void);
+  int Width(void) const { return width; }
+  int Height(void) const { return height; }
   void Dump(void) const;
   static const char *MediaType2Text(int Type);
 
 protected:
   cAbstractMedia(const cFile &File, const char *Mime, SupportedMediaType Type);
+  virtual void SetFormat(const char *Format);
   void SetMediaType(int NewType);
   void SetMimeType(const char *MimeType);
   const cFile &KeyPath(void) const { return keyPath; }
+  std::vector<cMediainfoReader::InfoEntry *> meta;
   int fd;
+  char *format;
+  short width;
+  short height;
+  double aspect;
 
 private:
   SupportedMediaType mediaType;
@@ -88,7 +97,6 @@ private:
   char *uri;
   char *logicalPath;
   cFile keyPath;
-  std::vector<cMediainfoReader::InfoEntry *> meta;
   };
 
 #endif	/* ABSTRACTMEDIA_H */
diff --git a/libs/mediaScan/include/Audio.h b/libs/mediaScan/include/Audio.h
index 3dc8faa..1677c53 100644
--- a/libs/mediaScan/include/Audio.h
+++ b/libs/mediaScan/include/Audio.h
@@ -32,11 +32,14 @@ public:
   cAudio(const cFile &File, const char *Mime);
   virtual ~cAudio();
 
+  virtual void AddMeta(cMediainfoReader::InfoEntry *Entry);
+  virtual const char *Name(void) const;
   virtual bool NeedsFurtherScan(void) const;
   static void EnableDeepScan(bool DoScan);
 
 private:
   static const char *ContentType(const char *Extension);
+  mutable char *name;
   static SupportedExtension knownExtensions[];
   friend class cMediaFactory;
   friend class FScanTest;
diff --git a/libs/mediaScan/include/Movie.h b/libs/mediaScan/include/Movie.h
index 36355b3..64d024d 100644
--- a/libs/mediaScan/include/Movie.h
+++ b/libs/mediaScan/include/Movie.h
@@ -33,11 +33,16 @@ public:
   virtual ~cMovie();
 
   virtual void AddMeta(cMediainfoReader::InfoEntry *Entry);
+  bool IsHD(void) const { return isHD; }
   virtual bool NeedsFurtherScan(void) const;
   static void EnableDeepScan(bool DoScan);
 
+protected:
+  virtual void SetFormat(const char *Format);
+  
 private:
   static const char *ContentType(const char *Extension);
+  bool isHD;
   static SupportedExtension knownExtensions[];
   friend class cMediaFactory;
   friend class FScanTest;