Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-19 14:43:30 +02:00
Code Issues Projects Releases Wiki Activity

2022-09-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in the voice-track widget where the audio markers
	would change relative position with respect to the waveform
	when the display was scrolled or resized.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-09-07 16:28:50 -04:00
parent 139c22dc7c
commit 9a10bba3e9
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -23276,3 +23276,7 @@
* Removed the 'Audio Editor' control from the 'Configure Host' * Removed the 'Audio Editor' control from the 'Configure Host'
dialog in rdadmin(1). dialog in rdadmin(1).
* Removed the 'Send to Editor' button from 'RDCartDialog'. * Removed the 'Send to Editor' button from 'RDCartDialog'.
2022-09-07 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the voice-track widget where the audio markers
would change relative position with respect to the waveform
when the display was scrolled or resized.

14
lib/rdtrackerwidget.cpp
View File

@ -1530,7 +1530,7 @@ void RDTrackerWidget::positionData(int id,int msecs)
int x=-1; int x=-1;
if(msecs>=0) { if(msecs>=0) {
if((msecs>=d_wave_origin[id])&& if((msecs>=d_wave_origin[id])&&
(msecs<(d_wave_origin[id]+d_wave_width))) { (msecs<(d_wave_origin[id]+d_time_width))) {
x=(int)(((double)(msecs-d_wave_origin[id]))* x=(int)(((double)(msecs-d_wave_origin[id]))*
((double)(d_wave_map[id]->size().width()))/ ((double)(d_wave_map[id]->size().width()))/
((double)size().width()*(double)TRACKER_START_WIDTH/800.0))+10; ((double)size().width()*(double)TRACKER_START_WIDTH/800.0))+10;
@ -2137,7 +2137,7 @@ void RDTrackerWidget::LoadTrack(int line)
d_wave_name[i]=""; d_wave_name[i]="";
d_loglines[i]=NULL; d_loglines[i]=NULL;
d_wave_origin[i]=0; d_wave_origin[i]=0;
d_wave_width=0; d_time_width=0;
} }
} }
else { else {
@ -2263,7 +2263,7 @@ void RDTrackerWidget::LoadTrack(int line)
} }
} }
} }
d_wave_width=(double)size().width()*(double)TRACKER_START_WIDTH/800.0; d_time_width=d_wave_map[2]->width()*TRACKER_MSECS_PER_PIXEL;
} }
d_start_time=d_log_model->blockStartTime(line); d_start_time=d_log_model->blockStartTime(line);
DrawTrackMap(0); DrawTrackMap(0);
@ -2851,7 +2851,7 @@ void RDTrackerWidget::DrawTrackMap(int trackno)
if(!d_wave_name[0].isEmpty()) { if(!d_wave_name[0].isEmpty()) {
d_wpg[0]->drawWaveByMsecs(0,d_wave_map[0]->width(), d_wpg[0]->drawWaveByMsecs(0,d_wave_map[0]->width(),
d_wave_origin[0], d_wave_origin[0],
d_wave_origin[0]+d_wave_width,800, d_wave_origin[0]+d_time_width,800,
RDWavePainter::Mono,Qt::black, RDWavePainter::Mono,Qt::black,
d_loglines[0]-> d_loglines[0]->
startPoint(RDLogLine::CartPointer), startPoint(RDLogLine::CartPointer),
@ -2993,7 +2993,7 @@ void RDTrackerWidget::DrawTrackMap(int trackno)
if(!d_wave_name[1].isEmpty()) { if(!d_wave_name[1].isEmpty()) {
d_wpg[1]->drawWaveByMsecs(0,d_wave_map[1]->width(), d_wpg[1]->drawWaveByMsecs(0,d_wave_map[1]->width(),
d_wave_origin[1], d_wave_origin[1],
d_wave_origin[1]+d_wave_width,800, d_wave_origin[1]+d_time_width,800,
RDWavePainter::Mono,Qt::black, RDWavePainter::Mono,Qt::black,
d_loglines[1]-> d_loglines[1]->
startPoint(RDLogLine::CartPointer), startPoint(RDLogLine::CartPointer),
@ -3105,11 +3105,11 @@ void RDTrackerWidget::DrawTrackMap(int trackno)
if(!d_wave_name[2].isEmpty()) { if(!d_wave_name[2].isEmpty()) {
d_wpg[2]-> d_wpg[2]->
drawWaveByMsecs(0,d_wave_map[2]->width(),d_wave_origin[2], drawWaveByMsecs(0,d_wave_map[2]->width(),d_wave_origin[2],
d_wave_origin[2]+d_wave_width,800, d_wave_origin[2]+d_time_width,800,
RDWavePainter::Mono,Qt::black, RDWavePainter::Mono,Qt::black,
d_loglines[2]->startPoint(RDLogLine::CartPointer), d_loglines[2]->startPoint(RDLogLine::CartPointer),
d_loglines[2]->endPoint(RDLogLine::CartPointer)); d_loglines[2]->endPoint(RDLogLine::CartPointer));
// //
// Draw Talk Markers // Draw Talk Markers
// //
if(d_loglines[2]->talkEndPoint()>0) { if(d_loglines[2]->talkEndPoint()>0) {

2
lib/rdtrackerwidget.h
View File

@ -181,7 +181,7 @@ class RDTrackerWidget : public RDWidget
int d_segue_start_offset[3]; int d_segue_start_offset[3];
DeckState d_deck_state; DeckState d_deck_state;
RDPlayDeck *d_deck[3]; RDPlayDeck *d_deck[3];
int d_wave_width; int d_time_width;
int d_input_card; int d_input_card;
int d_input_port; int d_input_port;
int d_output_card; int d_output_card;