Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 23:25:57 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Refactored the RDExportSettingDialog class to use RDApplication.
This commit is contained in:
Fred Gleason
2018-02-06 06:38:42 -05:00
parent bf38fd3c9f
commit 6c976c71d7
10 changed files with 31 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/rdexport_settings_dialog.cpp
View File

@@ -1,8 +1,8 @@
// rdexport_settings_dialog.cpp
//
// Edit RDLibrary Settings
// Edit Audio Export Settings
//
// (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
// it under the terms of the GNU General Public License version 2 as
@@ -18,27 +18,22 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qstring.h>
#include <qpushbutton.h>
#include <qlistbox.h>
#include <qtextedit.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <qbuttongroup.h>
#include <math.h>
#include <rdexport_settings_dialog.h>
#include <qbuttongroup.h>
#include <qcheckbox.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qpushbutton.h>
#include "rdapplication.h"
#include "rdexport_settings_dialog.h"
RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
RDStation *station,
QWidget *parent)
: QDialog(parent,"",true)
{
lib_settings=settings;
lib_station=station;
//
// Generate Fonts
@@ -54,7 +49,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
//
// Custom Encoders
//
lib_encoders=new RDEncoderList(station->name());
lib_encoders=new RDEncoderList(rda->station()->name());
//
// Default Format
@@ -141,7 +136,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
if(settings->format()==RDSettings::Pcm24) {
lib_format_box->setCurrentItem(lib_format_box->count()-1);
}
if(station->haveCapability(RDStation::HaveFlac)) {
if(rda->station()->haveCapability(RDStation::HaveFlac)) {
lib_format_box->insertItem(tr("FLAC"));
if(settings->format()==RDSettings::Flac) {
lib_format_box->setCurrentItem(lib_format_box->count()-1);
@@ -151,13 +146,13 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
if(settings->format()==RDSettings::MpegL2) {
lib_format_box->setCurrentItem(lib_format_box->count()-1);
}
if(station->haveCapability(RDStation::HaveLame)) {
if(rda->station()->haveCapability(RDStation::HaveLame)) {
lib_format_box->insertItem(tr("MPEG Layer 3"));
if(settings->format()==RDSettings::MpegL3) {
lib_format_box->setCurrentItem(lib_format_box->count()-1);
}
}
if(station->haveCapability(RDStation::HaveOggenc)) {
if(rda->station()->haveCapability(RDStation::HaveOggenc)) {
lib_format_box->insertItem(tr("OggVorbis"));
if(settings->format()==RDSettings::OggVorbis) {
lib_format_box->setCurrentItem(lib_format_box->count()-1);

11
lib/rdexport_settings_dialog.h
View File

@@ -2,7 +2,7 @@
//
// Edit Rivendell Audio Settings
//
// (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
// it under the terms of the GNU General Public License version 2 as
@@ -22,22 +22,19 @@
#define RDEXPORT_SETTINGS_DIALOG_H
#include <qdialog.h>
#include <qsqldatabase.h>
#include <qlineedit.h>
#include <qcombobox.h>
#include <qspinbox.h>
#include <qlabel.h>
#include <rdsettings.h>
#include <rdstation.h>
#include <rdencoderlist.h>
class RDExportSettingsDialog : public QDialog
{
Q_OBJECT
public:
RDExportSettingsDialog(RDSettings *settings,RDStation *station,
QWidget *parent=0);
RDExportSettingsDialog(RDSettings *settings,QWidget *parent=0);
~RDExportSettingsDialog();
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
@@ -55,7 +52,6 @@ class RDExportSettingsDialog : public QDialog
RDSettings::Format GetFormat(QString str);
RDEncoderList *lib_encoders;
RDSettings *lib_settings;
RDStation *lib_station;
QComboBox *lib_format_box;
QComboBox *lib_channels_box;
QLabel *lib_bitrate_label;
@@ -66,5 +62,4 @@ class RDExportSettingsDialog : public QDialog
};
#endif
#endif // RDEXPORT_SETTINGS_DIALOG_H

16
lib/rdimport_audio.cpp
View File

@@ -32,13 +32,13 @@
#include <qcheckbox.h>
#include <qpainter.h>
#include <rd.h>
#include <rdapplication.h>
#include <rdcart.h>
#include <rdconf.h>
#include <rdcut.h>
#include <rdescape_string.h>
#include <rdimport_audio.h>
#include "rd.h"
#include "rdapplication.h"
#include "rdcart.h"
#include "rdconf.h"
#include "rdcut.h"
#include "rdescape_string.h"
#include "rdimport_audio.h"
RDImportAudio::RDImportAudio(QString cutname,QString *path,
RDSettings *settings,bool *import_metadata,
@@ -456,7 +456,7 @@ void RDImportAudio::selectOutputFileData()
void RDImportAudio::selectOutputFormatData()
{
RDExportSettingsDialog *dialog=
new RDExportSettingsDialog(import_settings,rda->station(),this);
new RDExportSettingsDialog(import_settings,this);
dialog->exec();
delete dialog;
import_format_edit->setText(import_settings->description());