Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02: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
rdpanel/Makefile.am
View File

@@ -1,8 +1,6 @@
## automake.am
## Makefile.am
##
## Automake.am for rivendell/rdpanel
##
## (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
@@ -20,8 +18,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)
@@ -37,8 +35,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdpanel_*.qm
all:
@QT_BIN@/lupdate rdpanel.pro
@QT_BIN@/lrelease rdpanel.pro
lupdate-qt4 rdpanel.pro
lrelease-qt4 rdpanel.pro
bin_PROGRAMS = rdpanel
@@ -47,7 +45,7 @@ dist_rdpanel_SOURCES = globals.h\
nodist_rdpanel_SOURCES = moc_rdpanel.cpp
rdpanel_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
rdpanel_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
EXTRA_DIST = rdpanel.pro\
rdpanel_cs.ts\

9
rdpanel/rdpanel.cpp
View File

@@ -30,6 +30,9 @@
#include <qtranslator.h>
#include <qtextcodec.h>
#include <qpainter.h>
//Added by qt3to4:
#include <QCloseEvent>
#include <QPixmap>
#include <dbversion.h>
#include <rd.h>
@@ -202,7 +205,7 @@ MainWidget::MainWidget(QWidget *parent)
panel_panel->setPauseEnabled(rda->panelConf()->panelPauseEnabled());
panel_panel->setCard(0,rda->panelConf()->card(RDAirPlayConf::SoundPanel1Channel));
panel_panel->setPort(0,rda->panelConf()->port(RDAirPlayConf::SoundPanel1Channel));
panel_panel->setFocusPolicy(QWidget::NoFocus);
panel_panel->setFocusPolicy(Qt::NoFocus);
if((card=rda->panelConf()->card(RDAirPlayConf::SoundPanel2Channel))<0) {
panel_panel->setCard(1,panel_panel->card(RDAirPlayConf::MainLog1Channel));
panel_panel->setPort(1,panel_panel->port(RDAirPlayConf::MainLog1Channel));
@@ -303,7 +306,7 @@ MainWidget::MainWidget(QWidget *parent)
panel_stereo_meter->sizeHint().width(),
panel_stereo_meter->sizeHint().height());
panel_stereo_meter->setMode(RDSegMeter::Peak);
panel_stereo_meter->setFocusPolicy(QWidget::NoFocus);
panel_stereo_meter->setFocusPolicy(Qt::NoFocus);
if(rda->config()->useStreamMeters()) {
panel_stereo_meter->hide();
}
@@ -419,7 +422,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);
QTranslator rd(0);

2
rdpanel/rdpanel.h
View File

@@ -24,6 +24,8 @@
#include <qwidget.h>
#include <qtimer.h>
#include <qpixmap.h>
//Added by qt3to4:
#include <QCloseEvent>
#include <rdemptycart.h>
#include <rdevent_player.h>

4
rdpanel/rdpanel_cs.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
rdpanel/rdpanel_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
rdpanel/rdpanel_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
rdpanel/rdpanel_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
rdpanel/rdpanel_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>