Merge branch 'master' of ssh+git://pixel@git.grumpycoder.net/pub/repo.git/PSX-Bundle

3 files changed, 23 insertions, 1 deletions

diff --git a/includes/isobuilder.h b/includes/isobuilder.h
index 16a3a4d..88ab91a 100644
--- a/includes/isobuilder.h
+++ b/includes/isobuilder.h
@@ -63,12 +63,14 @@ class isobuilder : public Base {
         DirTree * Child();
         DirTree * Brother();
         DirTree * Find(const String &);
+        void setdvdmode();
       private:
         int buildpath_r(int * n, Byte * data, int size, int current_level, int level_to_dump, bool bigendian) throw (GeneralException);
         int maxlevel(int current_level = 1);
         DirTree * father, * child, * brother;
         bool dir;
         int node;
+        bool dvdmode;
     };
       isobuilder(Handle * w, int mode = MODE2_FORM1);
       ~isobuilder();
diff --git a/includes/luacd.h b/includes/luacd.h
index 1f7768f..baa4929 100644
--- a/includes/luacd.h
+++ b/includes/luacd.h
@@ -27,6 +27,8 @@
 #include <LuaHandle.h>
 #include <cdutils.h>
 #include <isobuilder.h>
+#include <cdabstract.h>
+#include <dvdabstract.h>
 
 #define CD_PUSHSTATICS(L) { \
     Luacdutils::pushstatics(L); \
@@ -34,6 +36,8 @@
     LuaPVD::pushstatics(L); \
     LuaDirTree::pushstatics(L); \
     Luaisobuilder::pushstatics(L); \
+    Luacdabstract::pushconstruct(L); \
+    Luadvdabstract::pushconstruct(L); \
 }
 
 class Luacdutils : public LuaObject {
@@ -89,4 +93,20 @@ class Luaisobuilder : public LuaObject {
     isobuilder * iso;
 };
 
+class Luacdabstract : public LuaHandle {
+  public:
+    static void pushconstruct(Lua *);
+      Luacdabstract(Handle *);
+  protected:
+    virtual void pushmembers(Lua *);
+};
+
+class Luadvdabstract : public LuaHandle {
+  public:
+    static void pushconstruct(Lua *);
+      Luadvdabstract(dvdabstract *);
+  protected:
+    virtual void pushmembers(Lua *);
+};
+
 #endif
diff --git a/includes/lzss.h b/includes/lzss.h
index 14aa345..8ba3fb5 100644
--- a/includes/lzss.h
+++ b/includes/lzss.h
@@ -59,7 +59,7 @@ class lzss : public Base {
     int tolerate, blockb;
     int blk, bitmap_count;
 
-    unsigned int lzss_decomp(Handle * f_source, Handle * f_cible, int true_length = -1);
+    unsigned int lzss_decomp(Handle * f_source, Handle * f_cible, int true_length = -1, bool read_length = true);
     void lzss_comp(Handle * f_source, Handle * f_cible, int * delta = NULL);
 
     Byte swap_bits(Byte);