*** empty log message ***

[h316.git] / pc-tools / ldc2 / src / tape_block.hh

diff --git a/pc-tools/ldc2/src/tape_block.hh b/pc-tools/ldc2/src/tape_block.hh
index 9f162df471d7b629ad397440a6f6e844c2b94109..f023ead0d05aa1dd6cbb38f3043599be1c82803a 100644 (file)
--- a/pc-tools/ldc2/src/tape_block.hh
+++ b/pc-tools/ldc2/src/tape_block.hh
@@ -1,6 +1,11 @@
 #ifndef TAPE_BLOCK_H
 #define TAPE_BLOCK_H
 
+#include <string>
+#include <vector>
+
+using namespace std;
+
 /*!
  *\brief Tape data block base class.
  *
@@ -33,26 +38,23 @@ public: // types
   } tb_type_t;
 
 public: // methods
-
-  static tape_block * 
-  gen_from_fd(int  fd,
-             void(*input_start)(void *)=0,
-             void (*input_stop)(void *)=0,
-             void * start_stop_arg=0
-             );
-  
   virtual ~tape_block();
+  
+  tape_block(tape_block &);
+  void operator=(tape_block &);
+
   tb_state_t get_state();
-  int get_raw_size();
-  unsigned char * get_raw_data();
   virtual int get_type();
   virtual int get_subtype();
-
-protected: // methods
-  tape_block(tape_block &);
-
-private: // methods
-
+  virtual vector<string> get_description();
+  int get_raw_size();
+  unsigned char * get_raw_data();
+  
+  static tape_block * gen_from_fd(int  fd,
+                                 void(*input_start)(void *)=0,
+                                 void (*input_stop)(void *)=0,
+                                 void * start_stop_arg=0
+                                 );
  
 private:   // methods
   tape_block();
@@ -61,6 +63,7 @@ private:   // methods
              void (*input_stop)(void *)=0,
              void * start_stop_arg=0
              );
+  
   int init_words(void);
   int test_checksum(); 
 
@@ -72,8 +75,7 @@ protected: // members
   int raw_size;               //!< Size of the raw data.
   unsigned short * word_data; //!< Data organized in machine words.
   int word_size;              //!< Size of the blocks in machine words.
-
-}; // tape_block
+}; // class tape_block
 
 
 #endif