2020-12-18 Fred Gleason <fredg@paravelsystems.com>

* Regularized the naming of class variables in the 'Voice Tracker'
	dialog in rdlogedit(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2020-12-18 13:01:57 -05:00
parent 8e8343c8cc
commit 9aef58b11d
3 changed files with 1586 additions and 1657 deletions

View File

@ -20714,3 +20714,6 @@
* Fixed bugs in the 'Voice Tracker' dialog of rdlogedit that * Fixed bugs in the 'Voice Tracker' dialog of rdlogedit that
could leave voice track carts in indeterminate state when the could leave voice track carts in indeterminate state when the
dialog was closed by means of the 'X' button. dialog was closed by means of the 'X' button.
2020-12-18 Fred Gleason <fredg@paravelsystems.com>
* Regularized the naming of class variables in the 'Voice Tracker'
dialog in rdlogedit(1).

File diff suppressed because it is too large Load Diff

View File

@ -103,7 +103,6 @@ class VoiceTracker : public RDDialog
void segueStartData(int id); void segueStartData(int id);
void selectionChangedData(const QItemSelection &selected, void selectionChangedData(const QItemSelection &selected,
const QItemSelection &deselected); const QItemSelection &deselected);
// void transitionChangedData(int line,RDLogLine::TransType trans);
void meterData(); void meterData();
void recordLoadedData(int card,int stream); void recordLoadedData(int card,int stream);
void recordingData(int card,int stream); void recordingData(int card,int stream);
@ -160,110 +159,105 @@ class VoiceTracker : public RDDialog
int SingleSelectionLine(bool incl_end_handle=false); int SingleSelectionLine(bool incl_end_handle=false);
void SendNotification(RDNotification::Action action,const QString &log_name); void SendNotification(RDNotification::Action action,const QString &log_name);
void SendNotification(RDNotification::Action action,unsigned cartnum); void SendNotification(RDNotification::Action action,unsigned cartnum);
RDStereoMeter *track_meter;
QTimer *track_meter_timer; bool d_segue_loaded;
RDTransportButton *track_play_button; unsigned d_play_start_macro;
RDTransportButton *track_stop_button; unsigned d_play_end_macro;
QPushButton *track_track1_button; unsigned d_record_start_macro;
QPushButton *track_record_button; unsigned d_record_end_macro;
QPushButton *track_track2_button; RDWavePainter *d_wpg[3];
QPushButton *track_finished_button; int d_menu_clicked_point;
QPushButton *track_post_button; RDGroup *d_group;
QPushButton *track_reset_button; int d_track_line;
QPushButton *track_previous_button; RDLogLine *d_loglines[3];
QPushButton *track_next_button; RDLogLine *d_saved_loglines[3];
QPushButton *track_insert_button; RDCart *d_track_cart;
QPushButton *track_delete_button; RDCut *d_track_cuts[3];
QPushButton *track_close_button; QString *d_import_path;
RDLog *track_log; RDSettings *d_settings;
RDEventPlayer *track_event_player; QPalette d_time_remaining_palette[2];
QString edit_log_name; QPixmap *d_wave_map[3];
int track_line; QString d_wave_name[3];
unsigned track_tracks; int d_scroll_pos[3];
int track_time_remaining; int d_wave_origin[3];
int track_time_remaining_start; int d_segue_start_point[3];
int track_time_counter; int d_segue_start_offset[3];
bool track_block_valid; DeckState d_deck_state;
QTime track_start_time; RDPlayDeck *d_deck[3];
QLabel *edit_length_label; int d_wave_width;
QLabel *edit_tracks_remaining_label; int d_cursor_pos;
QLabel *edit_time_remaining_label; int d_input_card;
QPalette edit_time_remaining_palette[2]; int d_input_port;
QPixmap *edit_wave_map[3]; int d_output_card;
QString edit_wave_name[3]; int d_output_port;
RDWavePainter *wpg[3]; int d_tail_preroll;
int edit_scroll_pos[3]; int d_threshold_level;
int edit_wave_origin[3]; RDCae::AudioCoding d_coding;
RDLogLine *edit_logline[3]; unsigned d_format;
RDLogLine *edit_saved_logline[3]; unsigned d_samprate;
int edit_segue_start_point[3]; unsigned d_bitrate;
int edit_segue_gain[3]; unsigned d_chans;
int edit_segue_start_offset[3]; bool d_sliding;
RDPlayDeck *edit_deck[3]; bool d_scrolling;
int edit_track_line[3]; int d_scroll_threshold;
bool track_redraw[3]; QPoint *d_previous_point;
unsigned track_redraw_count; int d_current_track;
RDCart *edit_track_cart; int d_rightclick_track;
RDCut *edit_track_cuts[3]; int d_rightclick_pos;
RDGroup *track_group; bool d_shift_pressed;
int edit_wave_width; RDStereoMeter *d_meter;
int edit_cursor_pos; QTimer *d_meter_timer;
int edit_input_card; RDTransportButton *d_play_button;
int edit_input_port; RDTransportButton *d_stop_button;
int edit_output_card; QPushButton *d_track1_button;
int edit_output_port; QPushButton *d_record_button;
int edit_tail_preroll; QPushButton *d_track2_button;
int edit_threshold_level; QPushButton *d_finished_button;
RDCae::AudioCoding edit_coding; QPushButton *d_post_button;
unsigned edit_format; QPushButton *d_reset_button;
unsigned edit_samprate; QPushButton *d_previous_button;
unsigned edit_bitrate; QPushButton *d_next_button;
unsigned edit_chans; QPushButton *d_insert_button;
unsigned play_start_macro; QPushButton *d_delete_button;
unsigned play_end_macro; QPushButton *d_close_button;
unsigned record_start_macro; RDEventPlayer *d_event_player;
unsigned record_end_macro; unsigned d_tracks;
DeckState edit_deck_state; int d_time_remaining;
bool edit_sliding; int d_time_remaining_start;
bool edit_scrolling; int d_time_counter;
int edit_scroll_threshold; bool d_block_valid;
QPoint *edit_previous_point; QTime d_start_time;
int edit_current_track; QLabel *d_length_label;
int edit_rightclick_track; QLabel *d_tracks_remaining_label;
int edit_rightclick_pos; QLabel *d_time_remaining_label;
QCursor *track_current_cursor; int d_track_lines[3];
QCursor *track_arrow_cursor; bool d_redraw[3];
QCursor *track_hand_cursor; unsigned d_redraw_count;
QCursor *track_cross_cursor; QCursor *d_current_cursor;
bool track_loaded; QCursor *d_arrow_cursor;
bool track_offset; QCursor *d_hand_cursor;
bool segue_loaded; QCursor *d_cross_cursor;
bool track_recording; bool d_loaded;
bool track_changed; bool d_offset;
double track_record_start_time; bool d_recording;
int track_recording_pos; bool d_changed;
bool track_aborting; double d_record_start_time;
bool track_record_ran; int d_recording_pos;
RDLogLine *track_dummy0_logline; bool d_aborting;
RDLogLine *track_dummy2_logline; bool d_record_ran;
QString track_import_filter; RDLogLine *d_dummy0_logline;
QString track_import_group; RDLogLine *d_dummy2_logline;
int track_preroll; int d_preroll;
bool track_size_altered; bool d_size_altered;
QPalette track_start_palette; QPalette d_start_palette;
QPalette track_record_palette; QPalette d_record_palette;
QPalette track_done_palette; QPalette d_done_palette;
QPalette track_abort_palette; QPalette d_abort_palette;
int menu_clicked_point; QRect *d_track_rect;
QString *edit_import_path; QRect *d_target_rect[VoiceTracker::TargetSize];
RDSettings *edit_settings; int d_target_track[VoiceTracker::TargetSize];
QRect *track_track_rect; VoiceTracker::Target d_current_target;
QRect *track_trackzones_rect[3]; RDLogLock *d_log_lock;
QRect *track_target_rect[VoiceTracker::TargetSize];
int track_target_track[VoiceTracker::TargetSize];
VoiceTracker::Target track_current_target;
bool edit_shift_pressed;
RDLogLock *track_log_lock;
LogTableView *d_log_view; LogTableView *d_log_view;
LogModel *d_log_model; LogModel *d_log_model;
RDLog *d_log; RDLog *d_log;