updated source to opie-reader 0.7g

1 files changed, 20 insertions, 6 deletions

diff --git a/noncore/apps/opie-reader/Bkmks.h b/noncore/apps/opie-reader/Bkmks.h
index ee528e4..c2275e2 100644
--- a/noncore/apps/opie-reader/Bkmks.h
+++ b/noncore/apps/opie-reader/Bkmks.h
@@ -16,12 +16,15 @@ class Bkmk
     unsigned char* m_anno;
     unsigned short m_annolen;
     unsigned int m_position;
+    unsigned int m_position2;
+    unsigned char m_red,m_green,m_blue, m_level;
     void init(const void*, unsigned short, const void*, unsigned short, unsigned int);
  public:
     Bkmk() : m_name(NULL), m_namelen(0), m_anno(NULL), m_annolen(0), m_position(0) {};
     Bkmk(const unsigned char* _nm, unsigned short _nmlen, const unsigned char* _anno, unsigned short _annolen, unsigned int _p);
     Bkmk(const tchar* _nm, const unsigned char* _anno, unsigned short _annolen, unsigned int _p);
     Bkmk(const tchar* _nm, const tchar* _anno, unsigned int _p);
+    Bkmk(const tchar* _nm, const tchar* _anno, unsigned int _p, unsigned int _p2);
     Bkmk(const Bkmk& rhs) : m_name(NULL), m_anno(NULL)
 	{
 	    *this = rhs;
@@ -29,6 +32,16 @@ class Bkmk
     ~Bkmk();
     unsigned int value() const { return m_position; }
     void value(unsigned int _v) { m_position = _v; }
+    unsigned int value2() const { return m_position2; }
+    void value2(unsigned int _v) { m_position2 = _v; }
+    unsigned char red() { return m_red; }
+    unsigned char green() { return m_green; }
+    unsigned char blue() { return m_blue; }
+    void red(unsigned char _v) { m_red = _v; }
+    void green(unsigned char _v) { m_green = _v; }
+    void blue(unsigned char _v) { m_blue = _v; }
+    unsigned char level() { return m_level; }
+    void level(unsigned char _v) { m_level = _v; }
     tchar *name() const { return (tchar*)m_name; }
     tchar *anno() const { return (tchar*)m_anno; }
     bool operator<(const Bkmk& rhs) { return (m_position < rhs.m_position); }
@@ -52,17 +65,18 @@ class BkmkFile
 {
     FILE* f;
     bool wt;
-    bool isUpgraded;
+    bool isUpgraded, m_extras;
     static const unsigned long magic;
  private:
-    static Bkmk* read06(FILE*);
-    static Bkmk* read05(FILE*);
-    static Bkmk* read03(FILE*);
-    CList<Bkmk>* readall00(Bkmk*(*fn)(FILE*));
+    static Bkmk* read07(BkmkFile*, FILE*);
+    static Bkmk* read06(BkmkFile*, FILE*);
+    static Bkmk* read05(BkmkFile*, FILE*);
+    static Bkmk* read03(BkmkFile*, FILE*);
+    CList<Bkmk>* readall00(Bkmk*(*fn)(BkmkFile*, FILE*));
     void write(const Bkmk& b);
  public:
     bool upgraded() { return isUpgraded; }
-    BkmkFile(const char *fnm, bool w = false);
+    BkmkFile(const char *fnm, bool w, bool _x);
     ~BkmkFile();
     void write(CList<Bkmk>& bl);
     CList<Bkmk>* readall();