Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +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

12
utils/rdimport/Makefile.am
View File

@@ -1,8 +1,6 @@
## automake.am
## Makefile.am
##
## Automake.am for rivendell/utils/rdimport
##
## (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)
@@ -34,7 +32,7 @@ dist_rdimport_SOURCES = markerset.cpp markerset.h\
nodist_rdimport_SOURCES = moc_rdimport.cpp
rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
CLEANFILES = *~\
*.idb\

14
utils/rdimport/rdimport.cpp
View File

@@ -895,7 +895,7 @@ void MainObject::ProcessFileList(const QString &flist)
{
QString entry;
for(unsigned i=0;i<flist.length();i++) {
for(int i=0;i<flist.length();i++) {
entry+=flist.at(i);
}
ProcessFileEntry(entry);
@@ -1638,7 +1638,7 @@ bool MainObject::RunPattern(const QString &pattern,const QString &filename,
RDWaveData *wavedata,QString *groupname)
{
bool macro_active=false;
unsigned ptr=0;
int ptr=0;
QChar field;
QString value;
QChar delimiter;
@@ -1664,10 +1664,10 @@ bool MainObject::RunPattern(const QString &pattern,const QString &filename,
ptr=1;
}
for(unsigned i=0;i<=filename.length();i++) {
for(int i=0;i<=filename.length();i++) {
if(macro_active) {
if((filename.at(i)==delimiter)||(i==filename.length())) {
switch(field) {
switch(field.toAscii()) {
case 'a':
wavedata->setArtist(value);
wavedata->setMetadataFound(true);
@@ -1843,13 +1843,13 @@ bool MainObject::RunPattern(const QString &pattern,const QString &filename,
bool MainObject::VerifyPattern(const QString &pattern)
{
bool macro_active=false;
for(unsigned i=0;i<pattern.length();i++) {
for(int i=0;i<pattern.length();i++) {
if(pattern.at(i)==QChar('%')) {
if(macro_active) {
return false;
}
macro_active=true;
switch(pattern.at(++i)) {
switch(pattern.at(++i).toAscii()) {
case 'a':
case 'b':
case 'c':
@@ -1986,7 +1986,7 @@ void MainObject::ReadXmlFile(const QString &basename,RDWaveData *wavedata) const
// Get XML Filename
//
QStringList f0=f0.split(".",basename);
for(unsigned i=0;i<f0.size()-1;i++) {
for(int i=0;i<f0.size()-1;i++) {
xmlname+=f0[i]+".";
}
xmlname+="xml";