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

2021-09-12 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlibrary(1) that caused the first cut to
	fail to be selected automatically when creating a new cart.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-09-12 14:44:24 -04:00
parent f0d871c9da
commit ce2321c2c9
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -22410,3 +22410,6 @@
2021-09-12 Fred Gleason <fredg@paravelsystems.com> 2021-09-12 Fred Gleason <fredg@paravelsystems.com>
* Fixed regressions where vestigal accelerator indicators ('&') * Fixed regressions where vestigal accelerator indicators ('&')
remained in in-line strings. remained in in-line strings.
2021-09-12 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlibrary(1) that caused the first cut to
fail to be selected automatically when creating a new cart.

6
rdlibrary/audio_cart.cpp
View File

@ -34,14 +34,14 @@
bool import_active=false; bool import_active=false;
AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path,
bool select_cut,bool profile_rip,QWidget *parent) bool new_cart,bool profile_rip,QWidget *parent)
: RDWidget(parent) : RDWidget(parent)
{ {
rdcart_import_metadata=true; rdcart_import_metadata=true;
rdcart_controls=controls; rdcart_controls=controls;
rdcart_cart=cart; rdcart_cart=cart;
rdcart_import_path=path; rdcart_import_path=path;
rdcart_select_cut=select_cut; rdcart_new_cart=new_cart;
rdcart_profile_rip=profile_rip; rdcart_profile_rip=profile_rip;
rdcart_modification_allowed=rda->user()->editAudio()&&cart->owner().isEmpty(); rdcart_modification_allowed=rda->user()->editAudio()&&cart->owner().isEmpty();
@ -226,7 +226,7 @@ void AudioCart::changeCutScheduling(int sched)
if(rdcart_cut_model->rowCount()>0) { if(rdcart_cut_model->rowCount()>0) {
RDCut *cut= RDCut *cut=
new RDCut(rdcart_cut_model->cutName(rdcart_cut_model->index(0,0))); new RDCut(rdcart_cut_model->cutName(rdcart_cut_model->index(0,0)));
if(cut->validity()==RDCut::AlwaysValid) { if((cut->validity()==RDCut::AlwaysValid)||rdcart_new_cart) {
rdcart_cut_view->selectRow(0); rdcart_cut_view->selectRow(0);
} }
delete cut; delete cut;

4
rdlibrary/audio_cart.h
View File

@ -36,7 +36,7 @@ class AudioCart : public RDWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
AudioCart(AudioControls *controls,RDCart *cart,QString *path,bool select_cut, AudioCart(AudioControls *controls,RDCart *cart,QString *path,bool new_cart,
bool profile_rip,QWidget *parent=0); bool profile_rip,QWidget *parent=0);
~AudioCart(); ~AudioCart();
QSize sizeHint() const; QSize sizeHint() const;
@ -74,7 +74,7 @@ class AudioCart : public RDWidget
RDCutListModel *rdcart_cut_model; RDCutListModel *rdcart_cut_model;
unsigned rdcart_average_length; unsigned rdcart_average_length;
QString *rdcart_import_path; QString *rdcart_import_path;
bool rdcart_select_cut; bool rdcart_new_cart;
AudioControls *rdcart_controls; AudioControls *rdcart_controls;
QPushButton *paste_cut_button; QPushButton *paste_cut_button;
bool rdcart_modification_allowed; bool rdcart_modification_allowed;