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

2018-08-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'pam_rd' plug-in.
	* Removed rdchunk(1).
	* Upgraded Qt3 to Qt4.
This commit is contained in:
Fred Gleason
2018-08-07 10:09:49 -04:00
parent 6b1a06a910
commit 796e1bebc3
774 changed files with 10347 additions and 10823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/rddiscimport/Makefile.am
View File

@@ -1,8 +1,6 @@
## automake.am
## Makefile.am
##
## Automake.am for rivendell/utils/rddiscimport
##
## (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-2006,2016-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
@@ -19,8 +17,8 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
# The dependency for qt's Meta Object Compiler (moc)
@@ -36,8 +34,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rddiscimport_*.qm
all:
@QT_BIN@/lupdate rddiscimport.pro
@QT_BIN@/lrelease rddiscimport.pro
lupdate-qt4 rddiscimport.pro
lrelease-qt4 rddiscimport.pro
bin_PROGRAMS = rddiscimport
@@ -47,7 +45,7 @@ dist_rddiscimport_SOURCES = metalibrary.cpp metalibrary.h\
nodist_rddiscimport_SOURCES = moc_rddiscimport.cpp
rddiscimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
rddiscimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
EXTRA_DIST = rddiscimport.pro\
rddiscimport_de.ts\

8
utils/rddiscimport/metalibrary.cpp
View File

@@ -122,7 +122,7 @@ void MetaLibrary::LoadLine(const QStringList fields)
{
MetaRecord *m=new MetaRecord();
meta_tracks.push_back(m);
for(unsigned i=0;i<fields.size();i++) {
for(int i=0;i<fields.size();i++) {
if(meta_headers[i]=="disc") {
m->setDiscId(fields[i]);
}
@@ -193,8 +193,8 @@ QStringList MetaLibrary::Split(const QString &sep,const QString &str)
QStringList ret;
bool quoted=false;
for(unsigned i=0;i<str.length();i++) {
switch(str[i]) {
for(int i=0;i<str.length();i++) {
switch(str.at(i).toAscii()) {
case ',':
if(quoted) {
buf+=str[i];
@@ -214,7 +214,7 @@ QStringList MetaLibrary::Split(const QString &sep,const QString &str)
break;
default:
buf+=str[i];
buf+=str.at(i);
break;
}
}

36
utils/rddiscimport/rddiscimport.cpp
View File

@@ -25,10 +25,14 @@
#include <qapplication.h>
#include <qwindowsstyle.h>
#include <qtextcodec.h>
#include <qfiledialog.h>
#include <q3filedialog.h>
#include <qmessagebox.h>
#include <qstringlist.h>
#include <qfiledialog.h>
#include <q3filedialog.h>
//Added by qt3to4:
#include <QTranslator>
#include <QLabel>
#include <QResizeEvent>
#include <rdapplication.h>
#include <rdaudioimport.h>
@@ -158,12 +162,12 @@ MainWidget::MainWidget(QWidget *parent)
dg_track_list=new RDListView(this);
dg_track_list->setAllColumnsShowFocus(true);
dg_track_list->setItemMargin(5);
dg_track_list->setSelectionMode(QListView::Single);
dg_track_list->setSelectionMode(Q3ListView::Single);
dg_track_list->setSortColumn(-1);
connect(dg_track_list,
SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)),
SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)),
this,
SLOT(trackDoubleClickedData(QListViewItem *,const QPoint &,int)));
SLOT(trackDoubleClickedData(Q3ListViewItem *,const QPoint &,int)));
dg_track_list->addColumn("#");
dg_track_list->setColumnAlignment(0,Qt::AlignHCenter);
@@ -183,13 +187,13 @@ MainWidget::MainWidget(QWidget *parent)
dg_disc_label=new QLabel(tr("Disk Progress"),this);
dg_disc_label->setFont(label_font);
dg_disc_label->setDisabled(true);
dg_disc_bar=new QProgressBar(this);
dg_disc_bar=new Q3ProgressBar(this);
dg_disc_bar->setDisabled(true);
dg_track_label=new QLabel(tr("Track Progress"),this);
dg_track_label->setFont(label_font);
dg_track_label->setDisabled(true);
dg_track_bar=new QProgressBar(this);
dg_track_bar=new Q3ProgressBar(this);
dg_track_bar->setTotalSteps(dg_ripper->totalSteps()+1);
dg_track_bar->setDisabled(true);
connect(dg_ripper,SIGNAL(progressChanged(int)),
@@ -221,7 +225,7 @@ MainWidget::MainWidget(QWidget *parent)
dg_channels_box->setCurrentItem(rda->libraryConf()->defaultChannels()-1);
dg_channels_label=new QLabel(dg_channels_box,tr("Channels")+":",this);
dg_channels_label->setFont(label_font);
dg_channels_label->setAlignment(AlignRight|AlignVCenter);
dg_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// Autotrim Check Box
@@ -241,10 +245,10 @@ MainWidget::MainWidget(QWidget *parent)
dg_autotrim_spin->setValue(rda->libraryConf()->trimThreshold()/100);
dg_autotrim_label=new QLabel(dg_autotrim_spin,tr("Level")+":",this);
dg_autotrim_label->setFont(label_font);
dg_autotrim_label->setAlignment(AlignRight|AlignVCenter);
dg_autotrim_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
dg_autotrim_unit=new QLabel(tr("dBFS"),this);
dg_autotrim_unit->setFont(label_font);
dg_autotrim_unit->setAlignment(AlignLeft|AlignVCenter);
dg_autotrim_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
// Normalize Check Box
@@ -264,10 +268,10 @@ MainWidget::MainWidget(QWidget *parent)
dg_normalize_spin->setValue(rda->libraryConf()->ripperLevel()/100);
dg_normalize_label=new QLabel(dg_normalize_spin,tr("Level:"),this);
dg_normalize_label->setFont(label_font);
dg_normalize_label->setAlignment(AlignRight|AlignVCenter);
dg_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
dg_normalize_unit=new QLabel(tr("dBFS"),this);
dg_normalize_unit->setFont(label_font);
dg_normalize_unit->setAlignment(AlignLeft|AlignVCenter);
dg_normalize_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
// Eject Button
@@ -312,7 +316,7 @@ void MainWidget::indexFileSelectedData()
QString filename;
int lines;
filename=QFileDialog::getOpenFileName(dg_indexfile_edit->text(),
filename=Q3FileDialog::getOpenFileName(dg_indexfile_edit->text(),
"CSV Files *.csv",this,"",
tr("RDDiscImport - Open Index File"));
dg_metalibrary->clear();
@@ -349,7 +353,7 @@ void MainWidget::autotrimCheckData(bool state)
}
void MainWidget::trackDoubleClickedData(QListViewItem *it,const QPoint &pt,
void MainWidget::trackDoubleClickedData(Q3ListViewItem *it,const QPoint &pt,
int row)
{
RDListViewItem *item=(RDListViewItem *)it;
@@ -558,7 +562,7 @@ void MainWidget::userChangedData()
dg_group_box->clear();
groups=rda->user()->groups();
for(unsigned i=0;i<groups.size();i++) {
for(int i=0;i<groups.size();i++) {
dg_group_box->insertItem(groups[i]);
if(dg_group_name==groups[i]) {
dg_group_box->setCurrentItem(i);
@@ -711,7 +715,7 @@ int main(int argc,char *argv[])
// Load Translations
//
QTranslator qt(0);
qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(),
qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(),
".");
a.installTranslator(&qt);

10
utils/rddiscimport/rddiscimport.h
View File

@@ -33,7 +33,9 @@
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qspinbox.h>
#include <qprogressbar.h>
#include <q3progressbar.h>
//Added by qt3to4:
#include <QResizeEvent>
#include <rdaudioimport.h>
#include <rdcdplayer.h>
@@ -59,7 +61,7 @@ class MainWidget : public QWidget
void indexFileSelectedData();
void groupActivatedData(int);
void autotrimCheckData(bool state);
void trackDoubleClickedData(QListViewItem *item,const QPoint &pt,int row);
void trackDoubleClickedData(Q3ListViewItem *item,const QPoint &pt,int row);
void ripData();
void normalizeCheckData(bool state);
void mediaChangedData();
@@ -85,9 +87,9 @@ class MainWidget : public QWidget
QLineEdit *dg_userdef_edit;
RDListView *dg_track_list;
QLabel *dg_disc_label;
QProgressBar *dg_disc_bar;
Q3ProgressBar *dg_disc_bar;
QLabel *dg_track_label;
QProgressBar *dg_track_bar;
Q3ProgressBar *dg_track_bar;
QLabel *dg_discid_label;
QLineEdit *dg_discid_edit;
QPushButton *dg_rip_button;

4
utils/rddiscimport/rddiscimport_de.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rddiscimport/rddiscimport_es.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rddiscimport/rddiscimport_fr.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rddiscimport/rddiscimport_nb.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rddiscimport/rddiscimport_nn.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rddiscimport/rddiscimport_pt_BR.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>