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

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2018-11-16 10:18:16 -05:00
commit 1f1b98d1a6
3 changed files with 46 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18028,3 +18028,5 @@
2018-11-16 Fred Gleason <fredg@paravelsystems.com> 2018-11-16 Fred Gleason <fredg@paravelsystems.com>
* Modified the 298 => 299 schema change in rddbmgr(8) to use the * Modified the 298 => 299 schema change in rddbmgr(8) to use the
new method for dropping a DB field. new method for dropping a DB field.
2018-11-16 Patrick Linstruth <patrick@deltecent.com>
* Fixed marker bugs in rdlibrary(1) audio editor widget.

97
lib/rdedit_audio.cpp
View File

@ -64,17 +64,6 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card,
QFont small_font("Helvetica",10,QFont::Bold); QFont small_font("Helvetica",10,QFont::Bold);
small_font.setPixelSize(10); small_font.setPixelSize(10);
edit_cursors[RDEditAudio::Play]=-1;
edit_cursors[RDEditAudio::SegueStart]=-1;
edit_cursors[RDEditAudio::SegueEnd]=-1;
edit_cursors[RDEditAudio::TalkStart]=-1;
edit_cursors[RDEditAudio::TalkEnd]=-1;
edit_cursors[RDEditAudio::Start]=-1;
edit_cursors[RDEditAudio::End]=-1;
edit_cursors[RDEditAudio::FadeUp]=-1;
edit_cursors[RDEditAudio::FadeDown]=-1;
edit_cursors[RDEditAudio::HookStart]=-1;
edit_cursors[RDEditAudio::HookEnd]=-1;
is_playing=false; is_playing=false;
is_paused=false; is_paused=false;
is_stopped=false; is_stopped=false;
@ -92,6 +81,11 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card,
delete_marker=false; delete_marker=false;
pause_mode=false; pause_mode=false;
played_cursor=0; played_cursor=0;
for(int i=0;i<RDEditAudio::LastMarker;i++) {
edit_cursors[i]=-1;
edit_prev_x[0][i]=-1;
edit_prev_x[1][i]=-1;
}
// //
// The Cut // The Cut
@ -1667,7 +1661,6 @@ void RDEditAudio::paintEvent(QPaintEvent *e)
// //
p->drawRect(11,130+EDITAUDIO_WAVEFORM_HEIGHT,717,197); p->drawRect(11,130+EDITAUDIO_WAVEFORM_HEIGHT,717,197);
p->end();
delete p; delete p;
UpdateCursors(); UpdateCursors();
} }
@ -2465,12 +2458,12 @@ void RDEditAudio::DrawMaps()
void RDEditAudio::UpdateCursors() void RDEditAudio::UpdateCursors()
{ {
if(edit_channels==1) { if(edit_channels==1) {
DrawCursors(11,11,EDITAUDIO_WAVEFORM_WIDTH,EDITAUDIO_WAVEFORM_HEIGHT,0); DrawCursors(11,11,EDITAUDIO_WAVEFORM_WIDTH,EDITAUDIO_WAVEFORM_HEIGHT-1,0);
} }
if(edit_channels==2) { if(edit_channels==2) {
DrawCursors(11,11,EDITAUDIO_WAVEFORM_WIDTH,EDITAUDIO_WAVEFORM_HEIGHT/2,0); DrawCursors(11,11,EDITAUDIO_WAVEFORM_WIDTH,EDITAUDIO_WAVEFORM_HEIGHT/2,0);
DrawCursors(11,11+EDITAUDIO_WAVEFORM_HEIGHT/2,EDITAUDIO_WAVEFORM_WIDTH, DrawCursors(11,11+EDITAUDIO_WAVEFORM_HEIGHT/2,EDITAUDIO_WAVEFORM_WIDTH,
EDITAUDIO_WAVEFORM_HEIGHT/2,1); (EDITAUDIO_WAVEFORM_HEIGHT/2)-1,1);
} }
} }
@ -2478,158 +2471,155 @@ void RDEditAudio::UpdateCursors()
void RDEditAudio::DrawCursors(int xpos,int ypos,int xsize,int ysize,int chan) void RDEditAudio::DrawCursors(int xpos,int ypos,int xsize,int ysize,int chan)
{ {
static int prev_x[2][12]={{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}};
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::Play],prev_x[chan][RDEditAudio::Play], edit_cursors[RDEditAudio::Play],edit_prev_x[chan][RDEditAudio::Play],
QColor(EDITAUDIO_PLAY_COLOR),RDEditAudio::None,20); QColor(EDITAUDIO_PLAY_COLOR),RDEditAudio::None,20);
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::SegueStart], edit_cursors[RDEditAudio::SegueStart],
prev_x[chan][RDEditAudio::SegueStart], edit_prev_x[chan][RDEditAudio::SegueStart],
QColor(RD_SEGUE_MARKER_COLOR), QColor(RD_SEGUE_MARKER_COLOR),
RDEditAudio::Right,30); RDEditAudio::Right,30);
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::SegueEnd], edit_cursors[RDEditAudio::SegueEnd],
prev_x[chan][RDEditAudio::SegueEnd], edit_prev_x[chan][RDEditAudio::SegueEnd],
QColor(RD_SEGUE_MARKER_COLOR), QColor(RD_SEGUE_MARKER_COLOR),
RDEditAudio::Left,30); RDEditAudio::Left,30);
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::Start], edit_cursors[RDEditAudio::Start],
prev_x[chan][RDEditAudio::Start], edit_prev_x[chan][RDEditAudio::Start],
QColor(RD_START_END_MARKER_COLOR), QColor(RD_START_END_MARKER_COLOR),
RDEditAudio::Right,10); RDEditAudio::Right,10);
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::End], edit_cursors[RDEditAudio::End],
prev_x[chan][RDEditAudio::End], edit_prev_x[chan][RDEditAudio::End],
QColor(RD_START_END_MARKER_COLOR), QColor(RD_START_END_MARKER_COLOR),
RDEditAudio::Left,10); RDEditAudio::Left,10);
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::TalkStart], edit_cursors[RDEditAudio::TalkStart],
prev_x[chan][RDEditAudio::TalkStart], edit_prev_x[chan][RDEditAudio::TalkStart],
QColor(RD_TALK_MARKER_COLOR), QColor(RD_TALK_MARKER_COLOR),
RDEditAudio::Right,20); RDEditAudio::Right,20);
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::TalkEnd], edit_cursors[RDEditAudio::TalkEnd],
prev_x[chan][RDEditAudio::TalkEnd], edit_prev_x[chan][RDEditAudio::TalkEnd],
QColor(RD_TALK_MARKER_COLOR), QColor(RD_TALK_MARKER_COLOR),
RDEditAudio::Left,20); RDEditAudio::Left,20);
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::FadeUp], edit_cursors[RDEditAudio::FadeUp],
prev_x[chan][RDEditAudio::FadeUp], edit_prev_x[chan][RDEditAudio::FadeUp],
QColor(RD_FADE_MARKER_COLOR), QColor(RD_FADE_MARKER_COLOR),
RDEditAudio::Left,40); RDEditAudio::Left,40);
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::FadeDown], edit_cursors[RDEditAudio::FadeDown],
prev_x[chan][RDEditAudio::FadeDown], edit_prev_x[chan][RDEditAudio::FadeDown],
QColor(RD_FADE_MARKER_COLOR), QColor(RD_FADE_MARKER_COLOR),
RDEditAudio::Right,40); RDEditAudio::Right,40);
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::HookStart], edit_cursors[RDEditAudio::HookStart],
prev_x[chan][RDEditAudio::HookStart], edit_prev_x[chan][RDEditAudio::HookStart],
QColor(RD_HOOK_MARKER_COLOR), QColor(RD_HOOK_MARKER_COLOR),
RDEditAudio::Right,50); RDEditAudio::Right,50);
EraseCursor(xpos,ypos,xsize,ysize,chan, EraseCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::HookEnd], edit_cursors[RDEditAudio::HookEnd],
prev_x[chan][RDEditAudio::HookEnd], edit_prev_x[chan][RDEditAudio::HookEnd],
QColor(RD_HOOK_MARKER_COLOR), QColor(RD_HOOK_MARKER_COLOR),
RDEditAudio::Left,50); RDEditAudio::Left,50);
prev_x[chan][RDEditAudio::Play]= edit_prev_x[chan][RDEditAudio::Play]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::Play], edit_cursors[RDEditAudio::Play],
prev_x[chan][RDEditAudio::Play], edit_prev_x[chan][RDEditAudio::Play],
QColor(EDITAUDIO_PLAY_COLOR), QColor(EDITAUDIO_PLAY_COLOR),
RDEditAudio::None,20, RDEditAudio::None,20,
RDEditAudio::Play, RDEditAudio::Play,
QPainter::RasterOp_SourceXorDestination); QPainter::RasterOp_SourceXorDestination);
prev_x[chan][RDEditAudio::SegueStart]= edit_prev_x[chan][RDEditAudio::SegueStart]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::SegueStart], edit_cursors[RDEditAudio::SegueStart],
prev_x[chan][RDEditAudio::SegueStart], edit_prev_x[chan][RDEditAudio::SegueStart],
QColor(RD_SEGUE_MARKER_COLOR), QColor(RD_SEGUE_MARKER_COLOR),
RDEditAudio::Right,30, RDEditAudio::Right,30,
RDEditAudio::SegueStart); RDEditAudio::SegueStart);
prev_x[chan][RDEditAudio::SegueEnd]= edit_prev_x[chan][RDEditAudio::SegueEnd]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::SegueEnd], edit_cursors[RDEditAudio::SegueEnd],
prev_x[chan][RDEditAudio::SegueEnd], edit_prev_x[chan][RDEditAudio::SegueEnd],
QColor(RD_SEGUE_MARKER_COLOR), QColor(RD_SEGUE_MARKER_COLOR),
RDEditAudio::Left,30, RDEditAudio::Left,30,
RDEditAudio::SegueEnd); RDEditAudio::SegueEnd);
prev_x[chan][RDEditAudio::Start]= edit_prev_x[chan][RDEditAudio::Start]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::Start], edit_cursors[RDEditAudio::Start],
prev_x[chan][RDEditAudio::Start], edit_prev_x[chan][RDEditAudio::Start],
QColor(RD_START_END_MARKER_COLOR), QColor(RD_START_END_MARKER_COLOR),
RDEditAudio::Right,10, RDEditAudio::Right,10,
RDEditAudio::Start); RDEditAudio::Start);
prev_x[chan][RDEditAudio::End]= edit_prev_x[chan][RDEditAudio::End]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::End], edit_cursors[RDEditAudio::End],
prev_x[chan][RDEditAudio::End], edit_prev_x[chan][RDEditAudio::End],
QColor(RD_START_END_MARKER_COLOR), QColor(RD_START_END_MARKER_COLOR),
RDEditAudio::Left,10, RDEditAudio::Left,10,
RDEditAudio::End); RDEditAudio::End);
prev_x[chan][RDEditAudio::TalkStart]= edit_prev_x[chan][RDEditAudio::TalkStart]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::TalkStart], edit_cursors[RDEditAudio::TalkStart],
prev_x[chan][RDEditAudio::TalkStart], edit_prev_x[chan][RDEditAudio::TalkStart],
QColor(RD_TALK_MARKER_COLOR), QColor(RD_TALK_MARKER_COLOR),
RDEditAudio::Right,20, RDEditAudio::Right,20,
RDEditAudio::TalkStart); RDEditAudio::TalkStart);
prev_x[chan][RDEditAudio::TalkEnd]= edit_prev_x[chan][RDEditAudio::TalkEnd]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::TalkEnd], edit_cursors[RDEditAudio::TalkEnd],
prev_x[chan][RDEditAudio::TalkEnd], edit_prev_x[chan][RDEditAudio::TalkEnd],
QColor(RD_TALK_MARKER_COLOR), QColor(RD_TALK_MARKER_COLOR),
RDEditAudio::Left,20, RDEditAudio::Left,20,
RDEditAudio::TalkEnd); RDEditAudio::TalkEnd);
prev_x[chan][RDEditAudio::FadeUp]= edit_prev_x[chan][RDEditAudio::FadeUp]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::FadeUp], edit_cursors[RDEditAudio::FadeUp],
prev_x[chan][RDEditAudio::FadeUp], edit_prev_x[chan][RDEditAudio::FadeUp],
QColor(RD_FADE_MARKER_COLOR), QColor(RD_FADE_MARKER_COLOR),
RDEditAudio::Left,40, RDEditAudio::Left,40,
RDEditAudio::FadeUp); RDEditAudio::FadeUp);
prev_x[chan][RDEditAudio::FadeDown]= edit_prev_x[chan][RDEditAudio::FadeDown]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::FadeDown], edit_cursors[RDEditAudio::FadeDown],
prev_x[chan][RDEditAudio::FadeDown], edit_prev_x[chan][RDEditAudio::FadeDown],
QColor(RD_FADE_MARKER_COLOR), QColor(RD_FADE_MARKER_COLOR),
RDEditAudio::Right,40, RDEditAudio::Right,40,
RDEditAudio::FadeDown); RDEditAudio::FadeDown);
prev_x[chan][RDEditAudio::HookStart]= edit_prev_x[chan][RDEditAudio::HookStart]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::HookStart], edit_cursors[RDEditAudio::HookStart],
prev_x[chan][RDEditAudio::HookStart], edit_prev_x[chan][RDEditAudio::HookStart],
QColor(RD_HOOK_MARKER_COLOR), QColor(RD_HOOK_MARKER_COLOR),
RDEditAudio::Right,50, RDEditAudio::Right,50,
RDEditAudio::HookStart); RDEditAudio::HookStart);
prev_x[chan][RDEditAudio::HookEnd]= edit_prev_x[chan][RDEditAudio::HookEnd]=
DrawCursor(xpos,ypos,xsize,ysize,chan, DrawCursor(xpos,ypos,xsize,ysize,chan,
edit_cursors[RDEditAudio::HookEnd], edit_cursors[RDEditAudio::HookEnd],
prev_x[chan][RDEditAudio::HookEnd], edit_prev_x[chan][RDEditAudio::HookEnd],
QColor(RD_HOOK_MARKER_COLOR), QColor(RD_HOOK_MARKER_COLOR),
RDEditAudio::Left,50, RDEditAudio::Left,50,
RDEditAudio::HookEnd); RDEditAudio::HookEnd);
@ -2653,7 +2643,7 @@ int RDEditAudio::DrawCursor(int xpos,int ypos,int xsize,int ysize,int chan,
p->setClipRect(xpos,ypos,xsize,ysize); p->setClipRect(xpos,ypos,xsize,ysize);
p->setCompositionMode(op); p->setCompositionMode(op);
p->translate(xpos,ypos); p->translate(xpos,ypos);
if((x>=0)&(x<EDITAUDIO_WAVEFORM_WIDTH)) { if((x>=0)&&(x<EDITAUDIO_WAVEFORM_WIDTH)) {
p->setPen(color); p->setPen(color);
p->drawLine(x,0,x,ysize); p->drawLine(x,0,x,ysize);
if(arrow==RDEditAudio::Left) { if(arrow==RDEditAudio::Left) {
@ -2685,7 +2675,6 @@ int RDEditAudio::DrawCursor(int xpos,int ypos,int xsize,int ysize,int chan,
delete point; delete point;
} }
} }
p->end();
delete p; delete p;
} }
return x; return x;
@ -2697,7 +2686,7 @@ void RDEditAudio::EraseCursor(int xpos,int ypos,int xsize,int ysize,int chan,
{ {
int x; int x;
if((edit_hscroll==NULL)||(prev<0)||(samp<0)) { if((edit_hscroll==NULL)||(prev<0)||((prev==0)&&(samp<0))) {
return; return;
} }
x=(int)((double)(samp-edit_hscroll->value())/edit_factor_x); x=(int)((double)(samp-edit_hscroll->value())/edit_factor_x);
@ -2736,7 +2725,6 @@ void RDEditAudio::EraseCursor(int xpos,int ypos,int xsize,int ysize,int chan,
} }
} }
} }
p->end();
delete p; delete p;
} }
} }
@ -2865,7 +2853,6 @@ void RDEditAudio::DrawWave(int xsize,int ysize,int chan,QString label,
p->setFont(QFont("Helvetica",24,QFont::Bold)); p->setFont(QFont("Helvetica",24,QFont::Bold));
p->drawText(270,0,"No Energy Data"); p->drawText(270,0,"No Energy Data");
} }
p->end();
delete p; delete p;
} }

1
lib/rdedit_audio.h
View File

@ -219,6 +219,7 @@ class RDEditAudio : public QDialog
int edit_stream; int edit_stream;
int edit_port; int edit_port;
int edit_preroll; int edit_preroll;
int edit_prev_x[2][LastMarker];
}; };