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

2018-02-05 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored the RDImportAudio class to use RDApplication.
This commit is contained in:
Fred Gleason 2018-02-05 02:57:01 -05:00
parent 957772c5e6
commit dbbf49e987
5 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -16670,3 +16670,5 @@
* Refactored the RDAudioExport class to use RDApplication. * Refactored the RDAudioExport class to use RDApplication.
2018-02-04 Fred Gleason <fredg@paravelsystems.com> 2018-02-04 Fred Gleason <fredg@paravelsystems.com>
* Refactored the RDAudioImport class to use RDApplication. * Refactored the RDAudioImport class to use RDApplication.
2018-02-05 Fred Gleason <fredg@paravelsystems.com>
* Refactored the RDImportAudio class to use RDApplication.

31
lib/rdimport_audio.cpp
View File

@ -2,7 +2,7 @@
// //
// Audio File Importation Dialog for Rivendell. // Audio File Importation Dialog for Rivendell.
// //
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -33,24 +33,19 @@
#include <qpainter.h> #include <qpainter.h>
#include <rd.h> #include <rd.h>
#include <rdconf.h> #include <rdapplication.h>
#include <rdwavefile.h>
#include <rdcart.h> #include <rdcart.h>
#include <rdconf.h>
#include <rdcut.h> #include <rdcut.h>
#include <rdescape_string.h> #include <rdescape_string.h>
#include <rdstation.h>
#include <rdimport_audio.h> #include <rdimport_audio.h>
#include <rdlibrary_conf.h>
RDImportAudio::RDImportAudio(QString cutname,QString *path, RDImportAudio::RDImportAudio(QString cutname,QString *path,
RDSettings *settings,bool *import_metadata, RDSettings *settings,bool *import_metadata,
RDWaveData *wavedata,RDCut *clipboard, RDWaveData *wavedata,RDCut *clipboard,
RDStation *station,RDUser *user, bool *running,QWidget *parent)
bool *running,RDConfig *config,
QWidget *parent)
: QDialog(parent) : QDialog(parent)
{ {
import_config=config;
import_default_settings=settings; import_default_settings=settings;
import_path=path; import_path=path;
import_settings=settings; import_settings=settings;
@ -59,8 +54,6 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
import_wavedata=wavedata; import_wavedata=wavedata;
import_clipboard=clipboard; import_clipboard=clipboard;
import_running=running; import_running=running;
import_station=station;
import_user=user;
import_file_filter=RD_AUDIO_FILE_FILTER; import_file_filter=RD_AUDIO_FILE_FILTER;
import_import_conv=NULL; import_import_conv=NULL;
import_export_conv=NULL; import_export_conv=NULL;
@ -440,7 +433,7 @@ void RDImportAudio::selectOutputFileData()
{ {
QString filename; QString filename;
QString filter=import_settings->formatName()+" (*."+ QString filter=import_settings->formatName()+" (*."+
RDSettings::defaultExtension(import_station->name(), RDSettings::defaultExtension(rda->station()->name(),
import_settings->format())+")"; import_settings->format())+")";
if(import_out_filename_edit->text().isEmpty()) { if(import_out_filename_edit->text().isEmpty()) {
@ -453,7 +446,7 @@ void RDImportAudio::selectOutputFileData()
} }
if(!filename.isEmpty()) { if(!filename.isEmpty()) {
import_out_filename_edit-> import_out_filename_edit->
setText(RDSettings::pathName(import_station->name(),filename, setText(RDSettings::pathName(rda->station()->name(),filename,
import_settings->format())); import_settings->format()));
*import_path=RDGetPathPart(import_out_filename_edit->text()); *import_path=RDGetPathPart(import_out_filename_edit->text());
} }
@ -463,12 +456,12 @@ void RDImportAudio::selectOutputFileData()
void RDImportAudio::selectOutputFormatData() void RDImportAudio::selectOutputFormatData()
{ {
RDExportSettingsDialog *dialog= RDExportSettingsDialog *dialog=
new RDExportSettingsDialog(import_settings,import_station,this); new RDExportSettingsDialog(import_settings,rda->station(),this);
dialog->exec(); dialog->exec();
delete dialog; delete dialog;
import_format_edit->setText(import_settings->description()); import_format_edit->setText(import_settings->description());
import_out_filename_edit-> import_out_filename_edit->
setText(RDSettings::pathName(import_station->name(), setText(RDSettings::pathName(rda->station()->name(),
import_out_filename_edit->text(), import_out_filename_edit->text(),
import_settings->format())); import_settings->format()));
} }
@ -559,7 +552,7 @@ void RDImportAudio::Import()
import_import_conv->setUseMetadata(import_in_metadata_box->isChecked()); import_import_conv->setUseMetadata(import_in_metadata_box->isChecked());
*import_running=true; *import_running=true;
import_import_aborted=false; import_import_aborted=false;
conv_err=import_import_conv->runImport(import_user->name(),import_user->password(),&audio_conv_err); conv_err=import_import_conv->runImport(rda->user()->name(),rda->user()->password(),&audio_conv_err);
*import_running=false; *import_running=false;
StopBar(); StopBar();
switch(conv_err) { switch(conv_err) {
@ -570,7 +563,7 @@ void RDImportAudio::Import()
wave->closeWave(); wave->closeWave();
delete wave; delete wave;
} }
cut->setOriginName(import_station->name()); cut->setOriginName(rda->station()->name());
cut-> cut->
setOriginDatetime(QDateTime(QDate::currentDate(),QTime::currentTime())); setOriginDatetime(QDateTime(QDate::currentDate(),QTime::currentTime()));
QMessageBox::information(this,tr("Import Complete"), QMessageBox::information(this,tr("Import Complete"),
@ -627,8 +620,8 @@ void RDImportAudio::Export()
import_export_conv->setEnableMetadata(import_out_metadata_box->isChecked()); import_export_conv->setEnableMetadata(import_out_metadata_box->isChecked());
*import_running=true; *import_running=true;
import_import_aborted=false; import_import_aborted=false;
conv_err=import_export_conv->runExport(import_user->name(), conv_err=import_export_conv->runExport(rda->user()->name(),
import_user->password(), rda->user()->password(),
&audio_conv_err); &audio_conv_err);
*import_running=false; *import_running=false;
StopBar(); StopBar();

21
lib/rdimport_audio.h
View File

@ -2,7 +2,7 @@
// //
// Audio File Importation Dialog for Rivendell. // Audio File Importation Dialog for Rivendell.
// //
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -37,15 +37,13 @@
#include <qbuttongroup.h> #include <qbuttongroup.h>
#include <qradiobutton.h> #include <qradiobutton.h>
#include <rdbusybar.h>
#include <rdwavedata.h>
#include <rdconfig.h>
#include <rdsettings.h>
#include <rdexport_settings_dialog.h>
#include <rdcut.h>
#include <rduser.h>
#include <rdaudioexport.h> #include <rdaudioexport.h>
#include <rdaudioimport.h> #include <rdaudioimport.h>
#include <rdbusybar.h>
#include <rdcut.h>
#include <rdexport_settings_dialog.h>
#include <rdsettings.h>
#include <rdwavedata.h>
// //
// Widget Settings // Widget Settings
@ -53,15 +51,13 @@
#define IMPORT_BAR_INTERVAL 500 #define IMPORT_BAR_INTERVAL 500
#define IMPORT_TEMP_BASENAME "rdlib" #define IMPORT_TEMP_BASENAME "rdlib"
class RDImportAudio : public QDialog class RDImportAudio : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
RDImportAudio(QString cutname,QString *path,RDSettings *settings, RDImportAudio(QString cutname,QString *path,RDSettings *settings,
bool *import_metadata,RDWaveData *wavedata, bool *import_metadata,RDWaveData *wavedata,
RDCut *clipboard,RDStation *station,RDUser *user,bool *running, RDCut *clipboard,bool *running,QWidget *parent=0);
RDConfig *config,QWidget *parent=0);
~RDImportAudio(); ~RDImportAudio();
QSize sizeHint() const; QSize sizeHint() const;
QSizePolicy sizePolicy() const; QSizePolicy sizePolicy() const;
@ -94,10 +90,7 @@ class RDImportAudio : public QDialog
void Export(); void Export();
void StartBar(); void StartBar();
void StopBar(); void StopBar();
RDConfig *import_config;
RDSettings *import_default_settings; RDSettings *import_default_settings;
RDStation *import_station;
RDUser *import_user;
RDCut *import_clipboard; RDCut *import_clipboard;
bool *import_running; bool *import_running;
QButtonGroup *import_mode_group; QButtonGroup *import_mode_group;

3
rdlibrary/audio_cart.cpp
View File

@ -628,8 +628,7 @@ void AudioCart::importCutData()
RDImportAudio *import=new RDImportAudio(cutname,rdcart_import_path, RDImportAudio *import=new RDImportAudio(cutname,rdcart_import_path,
&settings,&rdcart_import_metadata, &settings,&rdcart_import_metadata,
&wavedata,cut_clipboard, &wavedata,cut_clipboard,
rda->station(),rda->user(), &import_active);
&import_active,rda->config());
import->enableAutotrim(rda->libraryConf()->defaultTrimState()); import->enableAutotrim(rda->libraryConf()->defaultTrimState());
import->setAutotrimLevel(rda->libraryConf()->trimThreshold()); import->setAutotrimLevel(rda->libraryConf()->trimThreshold());
import->enableNormalization(rda->libraryConf()->ripperLevel()!=0); import->enableNormalization(rda->libraryConf()->ripperLevel()!=0);

3
rdlogedit/voice_tracker.cpp
View File

@ -2360,8 +2360,7 @@ bool VoiceTracker::ImportTrack(RDListViewItem *item)
RDWaveData *wdata=new RDWaveData(); RDWaveData *wdata=new RDWaveData();
RDImportAudio *import= RDImportAudio *import=
new RDImportAudio(edit_track_cuts[1]->cutName(),edit_import_path, new RDImportAudio(edit_track_cuts[1]->cutName(),edit_import_path,
edit_settings,&metadata,wdata,NULL,rda->station(),rda->user(), edit_settings,&metadata,wdata,NULL,&import_running,this);
&import_running,rda->config(),this);
if(import->exec(true,false)<0) { if(import->exec(true,false)<0) {
delete import; delete import;
delete wdata; delete wdata;