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

2021-07-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlogedit(1) that caused the rendering
	progress dialog to appear when there was no render being processed.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-07-28 10:51:08 -04:00
parent b7b7363d69
commit 7f93c17965
6 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -22097,3 +22097,6 @@
2021-07-27 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'RDLogListModel::updateRowLine()' that caused a
segfault.
2021-07-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogedit(1) that caused the rendering
progress dialog to appear when there was no render being processed.

1
lib/rdrenderer.cpp
View File

@ -304,7 +304,6 @@ bool RDRenderer::renderToFile(const QString &outfile,RDLogModel *model,
ret=Render(outfile,model,s,start_time,ignore_stops,err_msg,
first_line,last_line,first_time,last_time);
emit lineStarted(model->lineCount(),model->lineCount());
return ret;
}
return true;

3
rdlogedit/edit_log.cpp
View File

@ -77,8 +77,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
//
// Dialogs
//
edit_render_dialog=
new RenderDialog(rda->station(),rda->system(),rda->config(),this);
edit_render_dialog=new RenderDialog(this);
//
// Text Validator

2
rdlogedit/rdlogedit.cpp
View File

@ -33,13 +33,11 @@
#include "edit_log.h"
#include "globals.h"
#include "rdlogedit.h"
//#include "voice_tracker.h"
//
// Global Resources
//
bool global_import_running=false;
//QSize global_top_window_size;
QSize global_logedit_window_size;
int global_start_time_style;

11
rdlogedit/render_dialog.cpp
View File

@ -30,13 +30,9 @@
#include "render_dialog.h"
RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config,
QWidget *parent)
RenderDialog::RenderDialog(QWidget *parent)
: RDDialog(parent)
{
render_station=station;
render_system=system;
render_config=config;
render_save_path=RDHomeDir();
render_first_line=0;
render_last_line=0;
@ -55,6 +51,9 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config,
render_progress_dialog=
new QProgressDialog(tr("Rendering Log..."),tr("Cancel"),0,0,this);
render_progress_dialog->setWindowTitle(tr("Render Progress"));
render_progress_dialog->setMinimumDuration(1000);
render_progress_dialog->setAutoClose(true);
render_progress_dialog->reset();
render_cut_dialog=new RDCutDialog(NULL,NULL,NULL,false,true,true,"RDLogEdit",
false,this);
//
@ -62,7 +61,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config,
//
render_settings=new RDSettings();
render_settings->setChannels(2);
render_settings->setSampleRate(render_system->sampleRate());
render_settings->setSampleRate(rda->system()->sampleRate());
render_settings->setFormat(RDSettings::Pcm16);
render_settings->setLayer(2);
render_settings->setBitRate(256000);

9
rdlogedit/render_dialog.h
View File

@ -38,8 +38,7 @@ class RenderDialog : public RDDialog
{
Q_OBJECT
public:
RenderDialog(RDStation *station,RDSystem *system,RDConfig *config,
QWidget *parent=0);
RenderDialog(QWidget *parent=0);
~RenderDialog();
QSize sizeHint() const;
@ -61,9 +60,9 @@ class RenderDialog : public RDDialog
void resizeEvent(QResizeEvent *e);
private:
RDStation *render_station;
RDSystem *render_system;
RDConfig *render_config;
// RDStation *render_station;
// RDSystem *render_system;
// RDConfig *render_config;
RDUser *render_user;
RDLogModel *render_model;
int render_first_line;