aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/jack
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Output/jack')
-rw-r--r--src/plugins/Output/jack/outputjack.cpp8
-rw-r--r--src/plugins/Output/jack/outputjack.h4
-rw-r--r--src/plugins/Output/jack/outputjackfactory.cpp5
-rw-r--r--src/plugins/Output/jack/outputjackfactory.h2
4 files changed, 10 insertions, 9 deletions
diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp
index 2ecc27ed5..2555e5b1e 100644
--- a/src/plugins/Output/jack/outputjack.cpp
+++ b/src/plugins/Output/jack/outputjack.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2007 by Zhuravlev Uriy *
+ * Copyright (C) 2007-2008 by Zhuravlev Uriy *
* stalkerg@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -67,7 +67,7 @@ void OutputJACK::seek(long pos)
m_currentSeconds = -1;
}
-OutputJACK::OutputJACK(QObject * parent, bool useVolume)
+OutputJACK::OutputJACK(QObject *parent)
: Output(parent), m_inited(FALSE), m_pause(FALSE), m_play(FALSE),
m_userStop(FALSE), m_totalWritten(0), m_currentSeconds(-1),
m_bps(-1), m_frequency(-1), m_channels(-1), m_precision(-1)
@@ -80,7 +80,7 @@ OutputJACK::~OutputJACK()
uninitialize();
}
-void OutputJACK::configure(long freq, int chan, int prec, int brate)
+void OutputJACK::configure(long freq, int chan, int prec, int)
{
qDebug("OutputJACK: configure");
m_precision = prec;
@@ -117,7 +117,7 @@ bool OutputJACK::initialize()
m_inited = TRUE;
m_inited = TRUE;
m_configure = FALSE;
- jack_options_t options = JackNullOption;
+ jack_options_t options = JackNoStartServer;
jack_status_t status;
jack_client_t *client = jack_client_open ("test_qmmp", options, &status, NULL);
if (client == NULL)
diff --git a/src/plugins/Output/jack/outputjack.h b/src/plugins/Output/jack/outputjack.h
index 01c61d9ab..0f0c7ea5f 100644
--- a/src/plugins/Output/jack/outputjack.h
+++ b/src/plugins/Output/jack/outputjack.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2007 by Zhuravlev Uriy *
+ * Copyright (C) 2007-2008 by Zhuravlev Uriy *
* stalkerg@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -36,7 +36,7 @@ class OutputJACK : public Output
{
Q_OBJECT
public:
- OutputJACK(QObject * parent = 0, bool useVolume = TRUE);
+ OutputJACK(QObject * parent = 0);
~OutputJACK();
bool initialize();
bool isInitialized() const
diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp
index 51ce1b019..fbbe6f135 100644
--- a/src/plugins/Output/jack/outputjackfactory.cpp
+++ b/src/plugins/Output/jack/outputjackfactory.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2007 by Zhuravlev Uriy *
+ * Copyright (C) 2007-2008 by Zhuravlev Uriy *
* stalkerg@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -35,6 +35,7 @@ const OutputProperties OutputJACKFactory::properties() const
Output* OutputJACKFactory::create(QObject* parent, bool volume)
{
+ Q_UNUSED(volume);
return new OutputJACK(parent);
}
@@ -44,7 +45,7 @@ void OutputJACKFactory::showSettings(QWidget*)
void OutputJACKFactory::showAbout(QWidget *parent)
{
-QMessageBox::about (parent, tr("About Jack Output Plugin"),
+ QMessageBox::about (parent, tr("About Jack Output Plugin"),
tr("Qmmp Jack Output Plugin")+"\n"+
tr("Writen by: Yuriy Zhuravlev <slalkerg@gmail.com>"));
}
diff --git a/src/plugins/Output/jack/outputjackfactory.h b/src/plugins/Output/jack/outputjackfactory.h
index f3bb10476..6b99805e4 100644
--- a/src/plugins/Output/jack/outputjackfactory.h
+++ b/src/plugins/Output/jack/outputjackfactory.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006 by Ilya Kotov *
+ * Copyright (C) 2006-2008 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *