aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/General/dbuscontrol/translations/dbuscontrol_plugin_ru.ts2
-rw-r--r--src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts2
-rw-r--r--src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts2
-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
-rw-r--r--src/plugins/Output/oss/outputoss.cpp38
-rw-r--r--src/plugins/Output/oss/outputoss.h1
-rw-r--r--src/qmmpui/general.cpp5
10 files changed, 17 insertions, 52 deletions
diff --git a/src/plugins/General/dbuscontrol/translations/dbuscontrol_plugin_ru.ts b/src/plugins/General/dbuscontrol/translations/dbuscontrol_plugin_ru.ts
index 75b5d7019..aaaa99ab8 100644
--- a/src/plugins/General/dbuscontrol/translations/dbuscontrol_plugin_ru.ts
+++ b/src/plugins/General/dbuscontrol/translations/dbuscontrol_plugin_ru.ts
@@ -10,7 +10,7 @@
<message>
<location filename="../dbuscontrolfactory.cpp" line="48"/>
<source>About D-Bus Plugin</source>
- <translation>Об модуле D-bus</translation>
+ <translation>О модуле D-bus</translation>
</message>
<message>
<location filename="../dbuscontrolfactory.cpp" line="49"/>
diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts
index b9a03db12..af8bdd115 100644
--- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts
+++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts
@@ -11,7 +11,7 @@
<message>
<location filename="../scrobblerfactory.cpp" line="49"/>
<source>About Scrobbler Plugin</source>
- <translation>Об модуле Scrobbler </translation>
+ <translation>О модуле Scrobbler </translation>
</message>
<message>
<location filename="../scrobblerfactory.cpp" line="50"/>
diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts
index b939785ea..94631a52c 100644
--- a/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts
+++ b/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts
@@ -82,7 +82,7 @@
<message>
<location filename="../statusiconfactory.cpp" line="49"/>
<source>About Status Icon Plugin</source>
- <translation>Об модуле Status Icon</translation>
+ <translation>О модуле Status Icon</translation>
</message>
<message>
<location filename="../statusiconfactory.cpp" line="50"/>
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 *
diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp
index 2f8bf6bc4..9dfcadbbd 100644
--- a/src/plugins/Output/oss/outputoss.cpp
+++ b/src/plugins/Output/oss/outputoss.cpp
@@ -465,41 +465,3 @@ void OutputOSS::volume(int *ll,int *rr)
*ll = (*ll < 0) ? 0 : *ll;
*rr = (*rr < 0) ? 0 : *rr;
}
-
-
-void OutputOSS::checkVolume()
-{
- long ll = 0, lr = 0, cmd;
- int v, devs;
-
- /*
- * We dont show any errors if this fails, as this is called
- * rather often
- */
-// if (!open_mixer_device()) {
- ioctl(m_mixer_fd, SOUND_MIXER_READ_DEVMASK, &devs);
- if ((devs & SOUND_MASK_PCM) && (m_master == 0))
- cmd = SOUND_MIXER_READ_PCM;
- else if ((devs & SOUND_MASK_VOLUME) && (m_master == 1))
- cmd = SOUND_MIXER_READ_VOLUME;
- else
- return;
-
- ioctl(m_mixer_fd, cmd, &v);
- ll = (v & 0xFF00) >> 8;
- lr = (v & 0x00FF);
-
- ll = (ll > 100) ? 100 : ll;
- lr = (lr > 100) ? 100 : lr;
- ll = (ll < 0) ? 0 : ll;
- lr = (lr < 0) ? 0 : lr;
- if (bl!=ll || br!=lr)
- {
- bl = ll;
- br = lr;
- dispatchVolume(ll,lr);
- }
-// }
-}
-
-
diff --git a/src/plugins/Output/oss/outputoss.h b/src/plugins/Output/oss/outputoss.h
index 90a443ea6..c38bbc68b 100644
--- a/src/plugins/Output/oss/outputoss.h
+++ b/src/plugins/Output/oss/outputoss.h
@@ -46,7 +46,6 @@ public:
void seek(long);
void setVolume(int l, int r);
void volume(int* l,int* r);
- void checkVolume();
private:
// thread run function
diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index 3ed2e0843..2347939bf 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -89,7 +89,10 @@ QList<GeneralFactory*> *General::generalFactories()
}
void General::setVolume(int left, int right)
-{}
+{
+ Q_UNUSED(left);
+ Q_UNUSED(right);
+}
QStringList General::generalFiles()
{
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 22:27:48 +0000