fix merge

[enigma2.git] / lib / dvb / metaparser.h

diff --git a/lib/dvb/metaparser.h b/lib/dvb/metaparser.h
index 7e2b67794163c329053a1f13a4b0c7b27298ae5e..2ca94d6d97ebb1c3827d157fad336ecc4fd7b6bd 100644 (file)
--- a/lib/dvb/metaparser.h
+++ b/lib/dvb/metaparser.h
@@ -7,10 +7,21 @@
 class eDVBMetaParser
 {
 public:
 class eDVBMetaParser
 {
 public:

-       int parseFile(const std::string &filename);
-
+       eDVBMetaParser();
+       int parseFile(const std::string &basename);
+       
+       int parseMeta(const std::string &filename);
+       int parseRecordings(const std::string &filename);
+       int updateMeta(const std::string &basename);
+       
+       int m_data_ok;
+       

        eServiceReferenceDVB m_ref;
        std::string m_name, m_description;
        eServiceReferenceDVB m_ref;
        std::string m_name, m_description;

+       int m_time_create, m_length;
+       long long m_filesize;
+       
+       std::string m_tags;

 };
 
 #endif
 };
 
 #endif