2 files changed, 54 insertions, 10 deletions

diff --git a/includes/isobuilder.h b/includes/isobuilder.h
index e8cba8e..96bb9d9 100644
--- a/includes/isobuilder.h
+++ b/includes/isobuilder.h
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: isobuilder.h,v 1.5 2003-12-04 03:40:38 pixel Exp $ */
+/* $Id: isobuilder.h,v 1.6 2003-12-08 15:12:57 pixel Exp $ */
 
 #ifndef __ISOBUILDER_H__

 #define __ISOBUILDER_H__

@@ -70,18 +70,19 @@ class isobuilder : public Base {
     };

       isobuilder(Handle * w, int mode = MODE2_FORM1);

       ~isobuilder();

+    void foreword(cdutils *);

     void foreword(Handle * forewords, int mode = MODE_RAW);

     void foreword(Byte * forewords, int mode = MODE_RAW);

     int getdispsect();

-    int putfile(Handle * file, int mode = -1, int n = -1);

-    void putdatas(Byte * datas, size_t size, int mode = -1, int n = -1);

-    void createsector(Byte * datas, int type = -1, int n = -1);

+    int putfile(Handle * file, int mode = -1, int sector = -1);

+    int putdatas(Byte * datas, size_t size, int mode = -1, int sector = -1);

+    int createsector(Byte * datas, int mode = -1, int sector = -1);

     void setEOF();

     void clearEOF();

     DirTree * setbasics(PVD pvd, int rootsize = 1, int ptsize = 1, int nvd = 1, int rootsect = -1) throw (GeneralException);

-    DirTree * createdir(DirTree *, const String & _name, int size = 1, cdutils::DirEntry * = 0, int mode = MODE2_FORM1) throw (GeneralException);

-    DirTree * createfile(DirTree *, Handle * file, const String & _name, cdutils::DirEntry * = 0, int mode = MODE2_FORM1) throw (GeneralException);

-    void copydir(DirTree *, const String & _name, cdutils *, cdutils::DirEntry *, int mode = MODE2_FORM1);

+    DirTree * createdir(DirTree *, const String & _name, int size = 1, cdutils::DirEntry * = 0, int mode = -1) throw (GeneralException);

+    DirTree * createfile(DirTree *, Handle * file, const String & _name, cdutils::DirEntry * = 0, int mode = -1) throw (GeneralException);

+    void copydir(DirTree *, const String & _name, cdutils *, cdutils::DirEntry *, int mode = -1);

     static PVD createpvd(Handle *);

     static PVD createpvd(cdutils *);

     static PVD createpvd(Byte *);

diff --git a/includes/luacd.h b/includes/luacd.h
index f32eadd..2c66d96 100644
--- a/includes/luacd.h
+++ b/includes/luacd.h
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: luacd.h,v 1.2 2003-12-07 04:44:38 pixel Exp $ */
+/* $Id: luacd.h,v 1.3 2003-12-08 15:12:57 pixel Exp $ */
 
 #ifndef __LUACD_H__
 #define __LUACD_H__
@@ -26,10 +26,19 @@
 #include <BLua.h>

 #include <LuaHandle.h>

 #include <cdutils.h>

+#include <isobuilder.h>

+

+#define CD_PUSHSTATICS(L) { \

+    Luacdutils::pushstatics(L); \

+    Luacdfile::pushstatics(L); \

+    LuaPVD::pushstatics(L); \

+    LuaDirTree::pushstatics(L); \

+    Luaisobuilder::pushstatics(L); \

+}

 
 class Luacdutils : public LuaObject {
   public:
-    static void pushstatics(Lua *);

+    static void pushstatics(Lua *) throw (GeneralException);

       Luacdutils(cdutils *);
   protected:

     virtual void pushmembers(Lua *);

@@ -47,10 +56,44 @@ class Luacdfile : public LuaHandle {
 class Luadirentry : public LuaObject {
   public:
       Luadirentry(cdutils::DirEntry *);
-    const cdutils::DirEntry * getdir();
   protected:
     virtual void pushmembers(Lua *);
     cdutils::DirEntry * dir;
 };
 
+class Luacddate : public LuaObject {
+  public:
+      Luacddate(isobuilder::Date *);
+  private:
+    virtual void pushmembers(Lua *);
+    struct isobuilder::Date * date;
+};
+
+class LuaPVD : public LuaObject {
+  public:
+    static void pushstatics(Lua *) throw (GeneralException);

+      LuaPVD(struct isobuilder::PVD *);
+  private:
+    virtual void pushmembers(Lua *);
+    struct isobuilder::PVD * pvd;
+};
+
+class LuaDirTree : public LuaObject {
+  public:
+    static void pushstatics(Lua *) throw (GeneralException);
+      LuaDirTree(isobuilder::DirTree *);
+  private:
+    virtual void pushmembers(Lua *);
+    isobuilder::DirTree * dir;
+};
+
+class Luaisobuilder : public LuaObject {
+  public:
+    static void pushstatics(Lua *) throw (GeneralException);
+      Luaisobuilder(isobuilder *);
+  private:
+    virtual void pushmembers(Lua *);
+    isobuilder * iso;
+};
+
 #endif