Clean up a copy/assignment permissions for many classes.

This commit is contained in:
Jonathan Moore Liles 2008-05-07 20:05:49 -05:00
parent 9bf7183696
commit bff8d98078
17 changed files with 77 additions and 2 deletions

View File

@ -26,6 +26,9 @@
class Annotation_Region : public Sequence_Region class Annotation_Region : public Sequence_Region
{ {
/* not permitted */
Annotation_Region & operator = ( const Annotation_Region &rhs );
char *_label; char *_label;
public: public:

View File

@ -35,6 +35,9 @@ class Audio_File
{ {
static std::map <std::string, Audio_File*> _open_files; static std::map <std::string, Audio_File*> _open_files;
Audio_File ( const Audio_File &rhs );
const Audio_File & operator= ( const Audio_File &rhs );
protected: protected:
struct format_desc struct format_desc

View File

@ -32,6 +32,9 @@
class Audio_Region : public Sequence_Region class Audio_Region : public Sequence_Region
{ {
/* not permitted */
Audio_Region & operator = ( const Audio_Region &rhs );
public: public:
static bool inherit_track_color; static bool inherit_track_color;

View File

@ -35,6 +35,10 @@ const float CLOCK_UPDATE_FREQ = 0.06f;
class Clock : public Fl_Widget class Clock : public Fl_Widget
{ {
/* not permitted */
Clock ( const Clock &rhs );
Clock & operator = ( const Clock &rhs );
nframes_t _when; nframes_t _when;
nframes_t *_v; nframes_t *_v;

View File

@ -25,6 +25,11 @@
class Control_Sequence : public Sequence class Control_Sequence : public Sequence
{ {
/* not permitted */
Control_Sequence ( const Control_Sequence &rhs );
Control_Sequence & operator = ( const Control_Sequence &rhs );
public: public:
enum curve_type_e { Linear, Quadratic }; enum curve_type_e { Linear, Quadratic };

View File

@ -38,6 +38,10 @@ class Audio_Sequence;
class Disk_Stream : public Mutex class Disk_Stream : public Mutex
{ {
/* not permitted */
Disk_Stream ( const Disk_Stream &rhs );
Disk_Stream & operator = ( const Disk_Stream &rhs );
protected: protected:
pthread_t _thread; /* io thread */ pthread_t _thread; /* io thread */

View File

@ -51,6 +51,9 @@ class Engine : public Mutex
static int xrun ( void *arg ); static int xrun ( void *arg );
int xrun ( void ); int xrun ( void );
Engine ( const Engine &rhs );
Engine & operator = ( const Engine &rhs );
private: private:
friend class Port; friend class Port;

View File

@ -137,11 +137,12 @@ private:
void init ( bool loggable=true ) void init ( bool loggable=true )
{ {
_new_state = _old_state = NULL;
_nest = 0;
if ( loggable ) if ( loggable )
{ {
_id = ++_log_id; _id = ++_log_id;
_old_state = NULL;
_nest = 0;
ensure_size( _id ); ensure_size( _id );
@ -152,6 +153,9 @@ private:
} }
/* not implemented */
const Loggable & operator= ( const Loggable &rhs );
public: public:
static const char *escape ( const char *s ); static const char *escape ( const char *s );
@ -221,6 +225,7 @@ public:
static bool do_this ( const char *s, bool reverse ); static bool do_this ( const char *s, bool reverse );
protected: protected:
void log_start ( void ); void log_start ( void );
@ -251,6 +256,10 @@ class Logger
Loggable *_this; Loggable *_this;
Logger ( ) {} Logger ( ) {}
/* not permitted */
Logger ( const Logger &rhs );
const Logger & operator= ( const Logger &rhs );
public: public:
Logger ( Loggable *l ) : _this( l ) Logger ( Loggable *l ) : _this( l )
@ -286,6 +295,10 @@ class Log_Entry
char **_sa; char **_sa;
int _i; int _i;
/* not permitted */
Log_Entry ( const Log_Entry &rhs );
Log_Entry & operator= ( const Log_Entry &rhs );
public: public:
struct Pair struct Pair

View File

@ -123,6 +123,10 @@ class Peak_Writer
int _index; int _index;
Peak_Writer ( const Peak_Writer &rhs );
const Peak_Writer &operator= ( const Peak_Writer &rhs );
public: public:
Peak_Writer ( const char *filename, int chunksize, int channels ); Peak_Writer ( const char *filename, int chunksize, int channels );

View File

@ -28,6 +28,12 @@ class Port
jack_port_t *_port; jack_port_t *_port;
const char *_name; const char *_name;
/* FIXME: reference count? */
/* /\* not permitted *\/ */
/* Port ( const Port &rhs ); */
/* Port & operator= ( const Port &rhs ); */
public: public:
enum type_e { Output, Input }; enum type_e { Output, Input };

View File

@ -28,6 +28,11 @@ class Peak_Writer;
class Record_DS : public Disk_Stream class Record_DS : public Disk_Stream
{ {
/* not permitted */
Record_DS ( const Record_DS &rhs );
Record_DS & operator= ( const Record_DS &rhs );
nframes_t _frames_written; nframes_t _frames_written;
volatile nframes_t _stop_frame; volatile nframes_t _stop_frame;

View File

@ -41,6 +41,10 @@ class Sequence_Widget;
class Sequence : public Fl_Widget, public Loggable class Sequence : public Fl_Widget, public Loggable
{ {
/* not permitted */
Sequence ( const Sequence &rhs );
Sequence & operator= ( const Sequence &rhs );
static queue <Sequence_Widget *> _delete_queue; static queue <Sequence_Widget *> _delete_queue;
void init ( void ); void init ( void );
@ -61,6 +65,7 @@ public:
LOG_NAME_FUNC( Sequence ); LOG_NAME_FUNC( Sequence );
Sequence ( Track *track=0 ); Sequence ( Track *track=0 );
Sequence ( int X, int Y, int W, int H ); Sequence ( int X, int Y, int W, int H );
virtual ~Sequence ( ); virtual ~Sequence ( );

View File

@ -23,6 +23,8 @@
class Sequence_Point : public Sequence_Widget class Sequence_Point : public Sequence_Widget
{ {
/* not permitted */
Sequence_Point & operator= ( const Sequence_Point &rhs );
protected: protected:

View File

@ -112,6 +112,10 @@ Tempo_Point::handle ( int m )
class Tempo_Point_Editor : public Fl_Menu_Window class Tempo_Point_Editor : public Fl_Menu_Window
{ {
/* not permitted */
Tempo_Point_Editor ( const Tempo_Point_Editor &rhs );
Tempo_Point_Editor & operator = ( const Tempo_Point_Editor &rhs );
float *_tempo; float *_tempo;
Fl_Float_Input *_fi; Fl_Float_Input *_fi;

View File

@ -105,6 +105,9 @@ class Timeline : public Fl_Overlay_Window, public RWLock
nframes_t p1, p2; /* cursors */ nframes_t p1, p2; /* cursors */
/* not permitted */
Timeline ( const Timeline &rhs );
Timeline & operator = ( const Timeline &rhs );
public: public:

View File

@ -56,6 +56,10 @@ class Audio_File;
class Track : public Fl_Group, public Loggable class Track : public Fl_Group, public Loggable
{ {
/* not permitted */
Track ( const Track &rhs );
Track & operator= ( const Track &rhs );
public: public:
Track ( const char *L, int channels=1 ); Track ( const char *L, int channels=1 );

View File

@ -34,6 +34,10 @@ struct Transport : public jack_position_t, public Fl_Pack
private: private:
/* not permitted */
Transport ( const Transport &rhs );
Transport & operator = ( const Transport &rhs );
Fl_Button *_home_button; Fl_Button *_home_button;
Fl_Button *_end_button; Fl_Button *_end_button;
Fl_Button *_play_button; Fl_Button *_play_button;