Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-09 16:42:35 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #239 from deltecent/RDEditAudio

Browse Source 
(Master Bug Fix) "Fixed" a regression with RDTransportButton and QPushButton
This commit is contained in:
Fred Gleason 2018-10-01 07:59:55 -04:00 committed by GitHub
commit 1bf7df4fa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/rdedit_audio.cpp
View File

@ -141,6 +141,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card,
// Save Button // Save Button
// //
QPushButton *button=new QPushButton(this,"save_button"); QPushButton *button=new QPushButton(this,"save_button");
button->setFocusPolicy(Qt::NoFocus);
button->setGeometry(EDITAUDIO_WIDGET_WIDTH-90,EDITAUDIO_WIDGET_HEIGHT-120, button->setGeometry(EDITAUDIO_WIDGET_WIDTH-90,EDITAUDIO_WIDGET_HEIGHT-120,
80,50); 80,50);
button->setDefault(true); button->setDefault(true);
@ -152,6 +153,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card,
// Cancel Button // Cancel Button
// //
QPushButton *cancel_button=new QPushButton(this,"cancel_button"); QPushButton *cancel_button=new QPushButton(this,"cancel_button");
cancel_button->setFocusPolicy(Qt::NoFocus);
cancel_button->setGeometry(EDITAUDIO_WIDGET_WIDTH-90, cancel_button->setGeometry(EDITAUDIO_WIDGET_WIDTH-90,
EDITAUDIO_WIDGET_HEIGHT-60,80,50); EDITAUDIO_WIDGET_HEIGHT-60,80,50);
cancel_button->setDefault(true); cancel_button->setDefault(true);
@ -164,6 +166,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card,
// //
edit_play_cursor_button= edit_play_cursor_button=
new RDTransportButton(RDTransportButton::PlayBetween,this); new RDTransportButton(RDTransportButton::PlayBetween,this);
edit_play_cursor_button->setFocusPolicy(Qt::NoFocus);
edit_play_cursor_button->setGeometry(20,425,65,45); edit_play_cursor_button->setGeometry(20,425,65,45);
edit_play_cursor_button->setEnabled((edit_card>=0)&&(edit_port>=0)); edit_play_cursor_button->setEnabled((edit_card>=0)&&(edit_port>=0));
connect(edit_play_cursor_button,SIGNAL(clicked()), connect(edit_play_cursor_button,SIGNAL(clicked()),
@ -171,18 +174,21 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card,
edit_play_start_button= edit_play_start_button=
new RDTransportButton(RDTransportButton::Play,this); new RDTransportButton(RDTransportButton::Play,this);
edit_play_start_button->setFocusPolicy(Qt::NoFocus);
edit_play_start_button->setGeometry(90,425,65,45); edit_play_start_button->setGeometry(90,425,65,45);
edit_play_start_button->setEnabled((edit_card>=0)&&(edit_port>=0)); edit_play_start_button->setEnabled((edit_card>=0)&&(edit_port>=0));
connect(edit_play_start_button,SIGNAL(clicked()), connect(edit_play_start_button,SIGNAL(clicked()),
this,SLOT(playStartData())); this,SLOT(playStartData()));
edit_pause_button=new RDTransportButton(RDTransportButton::Pause,this); edit_pause_button=new RDTransportButton(RDTransportButton::Pause,this);
edit_pause_button->setFocusPolicy(Qt::NoFocus);
edit_pause_button->setGeometry(160,425,65,45); edit_pause_button->setGeometry(160,425,65,45);
edit_pause_button->setOnColor(QColor(Qt::red)); edit_pause_button->setOnColor(QColor(Qt::red));
edit_pause_button->setEnabled((edit_card>=0)&&(edit_port>=0)); edit_pause_button->setEnabled((edit_card>=0)&&(edit_port>=0));
connect(edit_pause_button,SIGNAL(clicked()),this,SLOT(pauseData())); connect(edit_pause_button,SIGNAL(clicked()),this,SLOT(pauseData()));
edit_stop_button=new RDTransportButton(RDTransportButton::Stop,this); edit_stop_button=new RDTransportButton(RDTransportButton::Stop,this);
edit_stop_button->setFocusPolicy(Qt::NoFocus);
edit_stop_button->setGeometry(230,425,65,45); edit_stop_button->setGeometry(230,425,65,45);
edit_stop_button->on(); edit_stop_button->on();
edit_stop_button->setOnColor(QColor(Qt::red)); edit_stop_button->setOnColor(QColor(Qt::red));
@ -2286,8 +2292,10 @@ void RDEditAudio::UpdateCounters()
(int)(1000.0*(double)((edit_cursors[RDEditAudio::Play]-baseline)*1152)/ (int)(1000.0*(double)((edit_cursors[RDEditAudio::Play]-baseline)*1152)/
(double)edit_sample_rate),true,true)); (double)edit_sample_rate),true,true));
if(prev_cue_point!=RDEditAudio::Play) { if(prev_cue_point!=RDEditAudio::Play) {
edit_cursor_edit[prev_cue_point]->clearFocus(); if(prev_cue_point!=edit_cue_point) {
edit_cursor_edit[prev_cue_point]->deselect(); edit_cursor_edit[prev_cue_point]->clearFocus();
edit_cursor_edit[prev_cue_point]->deselect();
}
} }
switch(edit_cue_point) { switch(edit_cue_point) {