summaryrefslogtreecommitdiff
path: root/libs/fsScan/include
diff options
context:
space:
mode:
Diffstat (limited to 'libs/fsScan/include')
-rw-r--r--libs/fsScan/include/AbstractMedia.h47
-rw-r--r--libs/fsScan/include/AbstractMultiFileMovie.h28
-rw-r--r--libs/fsScan/include/Audio.h15
-rw-r--r--libs/fsScan/include/DVDImage.h19
-rw-r--r--libs/fsScan/include/File.h32
-rw-r--r--libs/fsScan/include/FileRepresentation.h29
-rw-r--r--libs/fsScan/include/FileSystem.h19
-rw-r--r--libs/fsScan/include/FilesystemScanner.h19
-rw-r--r--libs/fsScan/include/LegacyVdrRecording.h17
-rw-r--r--libs/fsScan/include/MediaFactory.h28
-rw-r--r--libs/fsScan/include/Movie.h15
-rw-r--r--libs/fsScan/include/Picture.h15
-rw-r--r--libs/fsScan/include/VdrRecording.h17
13 files changed, 154 insertions, 146 deletions
diff --git a/libs/fsScan/include/AbstractMedia.h b/libs/fsScan/include/AbstractMedia.h
index 6ca9677..e101948 100644
--- a/libs/fsScan/include/AbstractMedia.h
+++ b/libs/fsScan/include/AbstractMedia.h
@@ -1,30 +1,31 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: AbstractMedia.h
* Created: 2. Juli 2012, 14
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef ABSTRACTMEDIA_H
#define ABSTRACTMEDIA_H
+#include <File.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <vector>
@@ -49,35 +50,31 @@ public:
virtual ~cAbstractMedia();
- virtual void Refresh(void);
- ///< will be called right before start streaming, so this call is used to
- ///< determine the real size, number of files, etc.
- virtual size_t ReadChunk(char *buf, size_t bufSize);
- ///< used to hide the differences between single- and multi-file media.
-
SupportedMediaType MediaType(void) const { return mediaType; }
- const char *LogicalPath(void) const { return logicalPath; }
- const char *RealPath(void) const { return realPath; }
- const char *Name(void) const { return name; }
const char *MimeType(void) const { return mimeType; }
- time_t LastModified(void) const { return lastModified; }
- void SetLastModified(time_t when) { lastModified = when; }
- size_t Size(void) const { return size; }
- void SetSize(size_t Size) { size = Size; }
+ const char *AbsolutePath(void) const;
+ ulong LastModified(void) const;
+ virtual const char *Name(void) const;
+ virtual size_t Size(void) const;
+ virtual const char *URI(void) const;
+ virtual void Refresh(void);
+ ///< will be called right before start streaming, so this call is used to
+ ///< determine the real size, number of files, etc.
+ virtual size_t ReadChunk(char *buf, size_t bufSize);
+ ///< used to hide the differences between single- and multi-file media.
static const char *MediaType2Text(int Type);
protected:
- cAbstractMedia(SupportedMediaType Type, const char *Name, const char *Logical, const char *Path, const char *Mime);
+ cAbstractMedia(const cFile &File, const char *Mime, SupportedMediaType Type);
+ void SetMimeType(const char *MimeType);
+ const cFile &KeyPath(void) { return keyPath; }
int fd;
private:
SupportedMediaType mediaType;
- char *logicalPath;
- char *realPath;
- char *name;
char *mimeType;
- time_t lastModified;
- size_t size;
+ char *uri;
+ cFile keyPath;
};
#endif /* ABSTRACTMEDIA_H */
diff --git a/libs/fsScan/include/AbstractMultiFileMovie.h b/libs/fsScan/include/AbstractMultiFileMovie.h
index e7bad44..f05826b 100644
--- a/libs/fsScan/include/AbstractMultiFileMovie.h
+++ b/libs/fsScan/include/AbstractMultiFileMovie.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: AbstractMultiFileMovie.h
* Created: 3. Juli 2012, 07
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef ABSTRACTMULTIFILEMOVIE_H
@@ -32,16 +32,24 @@ public:
virtual ~cAbstractMultiFileMovie();
virtual size_t ReadChunk(char *buf, size_t bufSize);
-
+ virtual const char *Name(void) const { return name; }
virtual const char *FirstFile(void) = 0;
virtual const char *NextFile(void) = 0;
+ virtual size_t Size(void) const { return size; }
protected:
- cAbstractMultiFileMovie(const char *Name, const char *Logical, const char *Path, const char *Mime, SupportedMediaType Type);
+ cAbstractMultiFileMovie(const cFile &File, const char *Mime, SupportedMediaType Type);
+ void SetName(char *Name);
+ void SetSize(size_t Size);
+ bool checkBuffer(void);
int movieFiles;
int curFileNo;
- char *fileNameBuf; // this class does not need it, but all subclasses do ...
- size_t bufSize;
+ char *buf;
+ int bufSize;
+
+private:
+ char *name; ///< name of multifile media may be different from any filesystem name, so handle a copy
+ size_t size;
};
#endif /* ABSTRACTMULTIFILEMOVIE_H */
diff --git a/libs/fsScan/include/Audio.h b/libs/fsScan/include/Audio.h
index 2b2046d..44472ef 100644
--- a/libs/fsScan/include/Audio.h
+++ b/libs/fsScan/include/Audio.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: Audio.h
* Created: 2. Juli 2012, 15
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef AUDIO_H
@@ -29,7 +29,7 @@
class cAudio : public cAbstractMedia {
public:
- cAudio(const char *Name, const char *Logical, const char *Path, const char *Mime);
+ cAudio(const cFile &File, const char *Mime);
virtual ~cAudio();
private:
@@ -37,6 +37,7 @@ private:
static SupportedExtension knownExtensions[];
friend class cMediaFactory;
friend class FScanTest;
+ friend int check4Media(void *, cFile *, const char *);
};
#endif /* AUDIO_H */
diff --git a/libs/fsScan/include/DVDImage.h b/libs/fsScan/include/DVDImage.h
index 4f3af2e..1a657ff 100644
--- a/libs/fsScan/include/DVDImage.h
+++ b/libs/fsScan/include/DVDImage.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: DVDImage.h
* Created: 3. Juli 2012, 08
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef DVDIMAGE_H
@@ -29,13 +29,14 @@
class cDVDImage : public cAbstractMultiFileMovie {
public:
- cDVDImage(const char *Name, const char *Logical, const char *Path);
+ cDVDImage(const cFile &File);
virtual ~cDVDImage();
- virtual void Refresh(void);
-
+ virtual const char *Name(void) const;
virtual const char *FirstFile(void);
virtual const char *NextFile(void);
+ virtual void Refresh(void);
+ virtual size_t Size(void) const;
private:
int mainMovie;
diff --git a/libs/fsScan/include/File.h b/libs/fsScan/include/File.h
index 4883cdd..587d99c 100644
--- a/libs/fsScan/include/File.h
+++ b/libs/fsScan/include/File.h
@@ -1,42 +1,44 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: File.h
- * Created: 21. Juli 2012, 12:41
+ * Created: 21. Juli 2012, 12
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef FILE_H
#define FILE_H
+#include <stddef.h>
#include <sys/types.h>
class cFileSystem;
class cFileRepresentation;
class cStringBuilder;
-class cFile
-{
+class cFile {
public:
- cFile(const char *Path);
+ cFile(const char *Path = NULL);
+ cFile(const cFile &other);
cFile(const cFile &Parent, const char *RelativePath);
virtual ~cFile();
+ cFile &operator =(const cFile &other);
bool CanRead(void) const;
bool CanWrite(void) const;
bool CanExecute(void) const;
@@ -47,11 +49,11 @@ public:
off64_t Size(void) const;
ulong LastModified(void) const;
const char *Name(void) const;
-
- char *AbsolutePath(void) const;
- cFile *Parent(void) const;
- void VisitFiles(int (*cb)(cFile *, const char *));
-
+ void SetVirtualRoot(bool isRoot = true);
+ const char *AbsolutePath(void) const; ///< returns an allocated string
+ char *toURI(void) const; ///< returns an allocated string
+ cFile *Parent(void) const; ///< allocates a new file instance!
+ void VisitFiles(int (*cb)(void *, cFile *, const char *), void *opaque);
static void Cleanup(void);
private:
diff --git a/libs/fsScan/include/FileRepresentation.h b/libs/fsScan/include/FileRepresentation.h
index 2193929..39a3c1e 100644
--- a/libs/fsScan/include/FileRepresentation.h
+++ b/libs/fsScan/include/FileRepresentation.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: FileRepresentation.h
- * Created: 21. Juli 2012, 12:41
+ * Created: 21. Juli 2012, 12
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef FILEREPRESENTATION_H
@@ -28,26 +28,29 @@
#include <sys/types.h>
class cStringBuilder;
-class cFileRepresentation
-{
+class cFileRepresentation {
public:
virtual ~cFileRepresentation();
- cStringBuilder *internalPath(void) const;
+ const char *Path(void) const;
const cFileRepresentation *getParent(void) const { return parent; };
+ void SetVirtualRoot(bool isRoot);
private:
- cFileRepresentation(const char *Path);
- cFileRepresentation(const cFileRepresentation *Parent, const char *Path);
+ cFileRepresentation(const char *Name);
+ cFileRepresentation(const cFileRepresentation *Parent, const char *Name);
+ char *toURI(void) const;
bool exists;
bool isRoot;
+ bool isVirtualRoot;
mode_t mode;
off64_t size;
ulong lastModified;
char *name;
+ mutable char *path;
const cFileRepresentation *parent;
friend class cFileSystem;
friend class cFile;
-};
+ };
#endif // FILEREPRESENTATION_H
diff --git a/libs/fsScan/include/FileSystem.h b/libs/fsScan/include/FileSystem.h
index eb0264e..0cf4a2f 100644
--- a/libs/fsScan/include/FileSystem.h
+++ b/libs/fsScan/include/FileSystem.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: FileSystem.h
- * Created: 21. Juli 2012, 12:44
+ * Created: 21. Juli 2012, 12
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef FILESYSTEM_H
@@ -30,8 +30,7 @@
class cFile;
class cFileRepresentation;
-class cFileSystem
-{
+class cFileSystem {
public:
cFileSystem();
virtual ~cFileSystem();
@@ -45,7 +44,7 @@ private:
static char PathSeparator;
static char RootPath[4];
friend class cFileRepresentation;
-};
+ };
#endif /* FILESYSTEM_H */
diff --git a/libs/fsScan/include/FilesystemScanner.h b/libs/fsScan/include/FilesystemScanner.h
index b90b50d..51cd44e 100644
--- a/libs/fsScan/include/FilesystemScanner.h
+++ b/libs/fsScan/include/FilesystemScanner.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: FilesystemScanner.h
* Created: 2. Juli 2012, 13
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef FILESYSTEMSCANNER_H
@@ -39,17 +39,10 @@ public:
std::map<int, size_t> &Categories(void) { return categories; }
cAbstractMedia *FindMedia(const char *LogicalPath);
void Refresh(void);
-
- void SetBaseDirectory(const char *dir);
void SetMediaFactory(cMediaFactory *factory);
-protected:
- void parseDir(const char *dir, cManagedVector &result);
-
private:
- char *baseDirectory;
size_t fileBufSize;
- struct dirent *dirEntryBuf;
cManagedVector pool;
std::map<int, size_t> categories;
cMediaFactory *mediaFactory;
diff --git a/libs/fsScan/include/LegacyVdrRecording.h b/libs/fsScan/include/LegacyVdrRecording.h
index 9c191be..d60902a 100644
--- a/libs/fsScan/include/LegacyVdrRecording.h
+++ b/libs/fsScan/include/LegacyVdrRecording.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: LegacyVdrRecording.h
* Created: 3. Juli 2012, 08
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef LEGACYVDRRECORDING_H
@@ -29,13 +29,12 @@
class cLegacyVdrRecording : public cAbstractMultiFileMovie {
public:
- cLegacyVdrRecording(const char *Name, const char *Logical, const char *Path);
+ cLegacyVdrRecording(const cFile &File);
virtual ~cLegacyVdrRecording();
- virtual void Refresh(void);
-
virtual const char *FirstFile(void);
virtual const char *NextFile(void);
+ virtual void Refresh(void);
};
#endif /* LEGACYVDRRECORDING_H */
diff --git a/libs/fsScan/include/MediaFactory.h b/libs/fsScan/include/MediaFactory.h
index a3b1987..200335b 100644
--- a/libs/fsScan/include/MediaFactory.h
+++ b/libs/fsScan/include/MediaFactory.h
@@ -1,46 +1,50 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: MediaFactory.h
* Created: 2. Juli 2012, 15
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef MEDIAFACTORY_H
#define MEDIAFACTORY_H
+#include <File.h>
#include <sys/stat.h>
#include <sys/types.h>
class cAbstractMedia;
+class cFile;
+class cManagedVector;
class cMediaFactory {
public:
- cMediaFactory(const char *BaseDirectory);
+ cMediaFactory(const cFile &BaseDirectory);
virtual ~cMediaFactory();
- cAbstractMedia *CreateMedia(const char *FileOrDirname, struct stat *st);
-
- const char *BaseDirectory(void) const { return baseDirectory; }
- void SetBaseDirectory(const char *dir);
+ cAbstractMedia *CreateMedia(const cFile &FileOrDirectory);
+ void Scan4Media(cManagedVector &pool);
+ const cFile &BaseDirectory(void) { return baseDirectory; }
+ void SetBaseDirectory(const cFile &dir);
private:
- char *baseDirectory;
+ static int createMedia(void *opaque, cFile *Parent, const char *Name);
+ cFile baseDirectory;
char *scratch;
size_t scratchSize;
};
diff --git a/libs/fsScan/include/Movie.h b/libs/fsScan/include/Movie.h
index 63cccc7..ecb62ec 100644
--- a/libs/fsScan/include/Movie.h
+++ b/libs/fsScan/include/Movie.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: Movie.h
* Created: 2. Juli 2012, 15
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef MOVIE_H
@@ -29,7 +29,7 @@
class cMovie : public cAbstractMedia {
public:
- cMovie(const char *Name, const char *Logical, const char *Path, const char *Mime, SupportedMediaType Type = cAbstractMedia::Movie);
+ cMovie(const cFile &File, const char *Mime, SupportedMediaType Type = cAbstractMedia::Movie);
virtual ~cMovie();
private:
@@ -37,6 +37,7 @@ private:
static SupportedExtension knownExtensions[];
friend class cMediaFactory;
friend class FScanTest;
+ friend int check4Media(void *, cFile *, const char *);
};
#endif /* MOVIE_H */
diff --git a/libs/fsScan/include/Picture.h b/libs/fsScan/include/Picture.h
index a1998e7..3e9a079 100644
--- a/libs/fsScan/include/Picture.h
+++ b/libs/fsScan/include/Picture.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: Picture.h
* Created: 2. Juli 2012, 15
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef PICTURE_H
@@ -29,7 +29,7 @@
class cPicture : public cAbstractMedia {
public:
- cPicture(const char *Name, const char *Logical, const char *Path, const char *Mime);
+ cPicture(const cFile &File, const char *Mime);
virtual ~cPicture();
private:
@@ -37,6 +37,7 @@ private:
static SupportedExtension knownExtensions[];
friend class cMediaFactory;
friend class FScanTest;
+ friend int check4Media(void *, cFile *, const char *);
};
#endif /* PICTURE_H */
diff --git a/libs/fsScan/include/VdrRecording.h b/libs/fsScan/include/VdrRecording.h
index 25e5996..9b92c61 100644
--- a/libs/fsScan/include/VdrRecording.h
+++ b/libs/fsScan/include/VdrRecording.h
@@ -1,25 +1,25 @@
/**
* ======================== legal notice ======================
- *
+ *
* File: VdrRecording.h
* Created: 3. Juli 2012, 08
* Author: <a href="mailto:geronimo013@gmx.de">Geronimo</a>
* Project: libfsScan: mediatypes and filesystem scanning
- *
+ *
* CMP - compound media player
- *
+ *
* is a client/server mediaplayer intended to play any media from any workstation
* without the need to export or mount shares. cmps is an easy to use backend
* with a (ready to use) HTML-interface. Additionally the backend supports
* authentication via HTTP-digest authorization.
* cmpc is a client with vdr-like osd-menues.
- *
+ *
* Copyright (c) 2012 Reinhard Mantey, some rights reserved!
* published under Creative Commons by-sa
* For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ *
* The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ *
* --------------------------------------------------------------
*/
#ifndef VDRRECORDING_H
@@ -29,13 +29,12 @@
class cVdrRecording : public cAbstractMultiFileMovie {
public:
- cVdrRecording(const char *Name, const char *Logical, const char *Path);
+ cVdrRecording(const cFile &File);
virtual ~cVdrRecording();
- virtual void Refresh(void);
-
virtual const char *FirstFile(void);
virtual const char *NextFile(void);
+ virtual void Refresh(void);
};
#endif /* VDRRECORDING_H */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 14:18:59 +0000