Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

finished licenses in VOIP. Files re-licensed with authorization

Browse Source
This commit is contained in:
csoler 2018-11-04 20:38:39 +01:00
parent 53ec7467d5
commit 15b3c48149
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
7 changed files with 125 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/FeedReader/FeedReader.pro
View File

@ -16,9 +16,6 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>. # # along with this program. If not, see <https://www.gnu.org/licenses/>. #
################################################################################ ################################################################################
TEMPLATE = subdirs
SUBDIRS += \
!include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri") !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri")
CONFIG += qt uic qrc resources CONFIG += qt uic qrc resources

75
plugins/VOIP/gui/AudioInputConfig.cpp
View File

@ -1,34 +1,25 @@
/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com> /*******************************************************************************
Copyright (C) 2008, Andreas Messer <andi@bupfen.de> * plugins/VOIP/gui/AudioInputConfig.h *
* *
All rights reserved. * Copyright (C) 2008, Andreas Messer <andi@bupfen.de> *
* Copyright (C) 2005-2010 Thorvald Natvig <thorvald@natvig.com> *
Redistribution and use in source and binary forms, with or without * Copyright (C) 2012 by Retroshare Team <retroshare.project@gmail.com> *
modification, are permitted provided that the following conditions * *
are met: * This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
- Redistributions of source code must retain the above copyright notice, * published by the Free Software Foundation, either version 3 of the *
this list of conditions and the following disclaimer. * License, or (at your option) any later version. *
- Redistributions in binary form must reproduce the above copyright notice, * *
this list of conditions and the following disclaimer in the documentation * This program is distributed in the hope that it will be useful, *
and/or other materials provided with the distribution. * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- Neither the name of the Mumble Developers nor the names of its * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
contributors may be used to endorse or promote products derived from this * GNU Affero General Public License for more details. *
software without specific prior written permission. * *
* You should have received a copy of the GNU Affero General Public License *
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * along with this program. If not, see <https://www.gnu.org/licenses/>. *
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * *
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *******************************************************************************/
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR #pragma once
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "AudioStats.h" #include "AudioStats.h"
#include "AudioInputConfig.h" #include "AudioInputConfig.h"
@ -42,14 +33,6 @@
#define iroundf(x) ( static_cast<int>(x) ) #define iroundf(x) ( static_cast<int>(x) )
/*void AudioInputDialog::hideEvent(QHideEvent *) {
qtTick->stop();
}
void AudioInputDialog::showEvent(QShowEvent *) {
qtTick->start(20);
}*/
class voipGraphSource: public RSGraphSource class voipGraphSource: public RSGraphSource
{ {
public: public:
@ -289,20 +272,6 @@ bool AudioInputConfig::save(QString &/*errmsg*/) {//mainly useless beacause savi
return true; return true;
} }
/*bool AudioInputDialog::expert(bool b) {
qgbInterfaces->setVisible(b);
qgbAudio->setVisible(b);
qliFrames->setVisible(b);
qsFrames->setVisible(b);
qlFrames->setVisible(b);
qswTransmit->setVisible(b);
qliIdle->setVisible(b);
qsIdle->setVisible(b);
qlIdle->setVisible(b);
return true;
}*/
void AudioInputConfig::on_qsTransmitHold_valueChanged(int v) { void AudioInputConfig::on_qsTransmitHold_valueChanged(int v) {
float val = static_cast<float>(v * FRAME_SIZE); float val = static_cast<float>(v * FRAME_SIZE);
val = val / SAMPLING_RATE; val = val / SAMPLING_RATE;

51
plugins/VOIP/gui/AudioInputConfig.h
View File

@ -1,33 +1,24 @@
/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com> /*******************************************************************************
* plugins/VOIP/gui/AudioInputConfig.h *
All rights reserved. * *
* Copyright (C) 2005-2010 Thorvald Natvig <thorvald@natvig.com> *
Redistribution and use in source and binary forms, with or without * Copyright (C) 2012 by Retroshare Team <retroshare.project@gmail.com> *
modification, are permitted provided that the following conditions * *
are met: * This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
- Redistributions of source code must retain the above copyright notice, * published by the Free Software Foundation, either version 3 of the *
this list of conditions and the following disclaimer. * License, or (at your option) any later version. *
- Redistributions in binary form must reproduce the above copyright notice, * *
this list of conditions and the following disclaimer in the documentation * This program is distributed in the hope that it will be useful, *
and/or other materials provided with the distribution. * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- Neither the name of the Mumble Developers nor the names of its * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
contributors may be used to endorse or promote products derived from this * GNU Affero General Public License for more details. *
software without specific prior written permission. * *
* You should have received a copy of the GNU Affero General Public License *
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * along with this program. If not, see <https://www.gnu.org/licenses/>. *
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * *
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *******************************************************************************/
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR #pragma once
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once #pragma once
#include <QAudioInput> #include <QAudioInput>

50
plugins/VOIP/gui/AudioStats.cpp
View File

@ -1,32 +1,24 @@
/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com> /*******************************************************************************
* plugins/VOIP/gui/AudioStats.cpp *
All rights reserved. * *
* Copyright (C) 2005-2010 Thorvald Natvig <thorvald@natvig.com> *
Redistribution and use in source and binary forms, with or without * Copyright (C) 2012 by Retroshare Team <retroshare.project@gmail.com> *
modification, are permitted provided that the following conditions * *
are met: * This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
- Redistributions of source code must retain the above copyright notice, * published by the Free Software Foundation, either version 3 of the *
this list of conditions and the following disclaimer. * License, or (at your option) any later version. *
- Redistributions in binary form must reproduce the above copyright notice, * *
this list of conditions and the following disclaimer in the documentation * This program is distributed in the hope that it will be useful, *
and/or other materials provided with the distribution. * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- Neither the name of the Mumble Developers nor the names of its * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
contributors may be used to endorse or promote products derived from this * GNU Affero General Public License for more details. *
software without specific prior written permission. * *
* You should have received a copy of the GNU Affero General Public License *
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * along with this program. If not, see <https://www.gnu.org/licenses/>. *
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * *
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *******************************************************************************/
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR #include <QTimer>
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#define iroundf(x) ( static_cast<int>(x) ) #define iroundf(x) ( static_cast<int>(x) )

51
plugins/VOIP/gui/AudioStats.h
View File

@ -1,35 +1,26 @@
/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com> /*******************************************************************************
* plugins/VOIP/gui/AudioStats.h *
All rights reserved. * *
* Copyright (C) 2005-2010 Thorvald Natvig <thorvald@natvig.com> *
Redistribution and use in source and binary forms, with or without * Copyright (C) 2012 by Retroshare Team <retroshare.project@gmail.com> *
modification, are permitted provided that the following conditions * *
are met: * This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
- Redistributions of source code must retain the above copyright notice, * published by the Free Software Foundation, either version 3 of the *
this list of conditions and the following disclaimer. * License, or (at your option) any later version. *
- Redistributions in binary form must reproduce the above copyright notice, * *
this list of conditions and the following disclaimer in the documentation * This program is distributed in the hope that it will be useful, *
and/or other materials provided with the distribution. * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- Neither the name of the Mumble Developers nor the names of its * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
contributors may be used to endorse or promote products derived from this * GNU Affero General Public License for more details. *
software without specific prior written permission. * *
* You should have received a copy of the GNU Affero General Public License *
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * along with this program. If not, see <https://www.gnu.org/licenses/>. *
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * *
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *******************************************************************************/
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once #pragma once
#include <QTimer>
#include <QWidget> #include <QWidget>
//#include "mumble_pch.hpp" //#include "mumble_pch.hpp"

110
plugins/VOIP/gui/AudioWizard.cpp
View File

@ -1,41 +1,26 @@
/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com> /*******************************************************************************
* plugins/VOIP/gui/AudioWizard.cpp *
All rights reserved. * *
* Copyright (C) 2005-2010 Thorvald Natvig <thorvald@natvig.com> *
Redistribution and use in source and binary forms, with or without * Copyright (C) 2012 by Retroshare Team <retroshare.project@gmail.com> *
modification, are permitted provided that the following conditions * *
are met: * This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
- Redistributions of source code must retain the above copyright notice, * published by the Free Software Foundation, either version 3 of the *
this list of conditions and the following disclaimer. * License, or (at your option) any later version. *
- Redistributions in binary form must reproduce the above copyright notice, * *
this list of conditions and the following disclaimer in the documentation * This program is distributed in the hope that it will be useful, *
and/or other materials provided with the distribution. * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- Neither the name of the Mumble Developers nor the names of its * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
contributors may be used to endorse or promote products derived from this * GNU Affero General Public License for more details. *
software without specific prior written permission. * *
* You should have received a copy of the GNU Affero General Public License *
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * along with this program. If not, see <https://www.gnu.org/licenses/>. *
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * *
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *******************************************************************************/
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <QTimer> #include <QTimer>
#include "AudioWizard.h" #include "AudioWizard.h"
//#include "AudioInput.h"
//#include "Global.h"
//#include "Settings.h"
//#include "Log.h"
//#include "MainWindow.h"
#include "audiodevicehelper.h" #include "audiodevicehelper.h"
#include "interface/rsVOIP.h" #include "interface/rsVOIP.h"
@ -131,23 +116,6 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) {
connect( ticker, SIGNAL( timeout ( ) ), this, SLOT( on_Ticker_timeout() ) ); connect( ticker, SIGNAL( timeout ( ) ), this, SLOT( on_Ticker_timeout() ) );
} }
/*bool AudioWizard::eventFilter(QObject *obj, QEvent *evt) {
if ((evt->type() == QEvent::MouseButtonPress) ||
(evt->type() == QEvent::MouseMove)) {
QMouseEvent *qme = dynamic_cast<QMouseEvent *>(evt);
if (qme) {
if (qme->buttons() & Qt::LeftButton) {
QPointF qpf = qgvView->mapToScene(qme->pos());
fX = static_cast<float>(qpf.x());
fY = static_cast<float>(qpf.y());
}
}
}
return QWizard::eventFilter(obj, evt);
}*/
void AudioWizard::on_qsMaxAmp_valueChanged(int v) { void AudioWizard::on_qsMaxAmp_valueChanged(int v) {
rsVOIP->setVoipiMinLoudness(qMin(v, 30000)); rsVOIP->setVoipiMinLoudness(qMin(v, 30000));
} }
@ -267,44 +235,6 @@ void AudioWizard::on_qrContinuous_clicked(bool on) {
} }
} }
/*void AudioWizard::on_skwPTT_keySet(bool valid, bool last) {
if (valid)
qrPTT->setChecked(true);
else if (qrPTT->isChecked())
qrAmplitude->setChecked(true);
updateTriggerWidgets(valid);
bTransmitChanged = true;
if (last) {
const QList<QVariant> &buttons = skwPTT->getShortcut();
QList<Shortcut> ql;
bool found = false;
foreach(Shortcut s, g.s.qlShortcuts) {
if (s.iIndex == g.mw->gsPushTalk->idx) {
if (buttons.isEmpty())
continue;
else if (! found) {
s.qlButtons = buttons;
found = true;
}
}
ql << s;
}
if (! found && ! buttons.isEmpty()) {
Shortcut s;
s.iIndex = g.mw->gsPushTalk->idx;
s.bSuppress = false;
s.qlButtons = buttons;
ql << s;
}
g.s.qlShortcuts = ql;
GlobalShortcutEngine::engine->bNeedRemap = true;
GlobalShortcutEngine::engine->needRemap();
}
}*/
void AudioWizard::updateTriggerWidgets(bool vad_on) { void AudioWizard::updateTriggerWidgets(bool vad_on) {
if (!vad_on) if (!vad_on)
qwVAD->hide(); qwVAD->hide();

49
plugins/VOIP/gui/AudioWizard.h
View File

@ -1,32 +1,23 @@
/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com> /*******************************************************************************
* plugins/VOIP/gui/AudioWizard.h *
All rights reserved. * *
* Copyright (C) 2005-2010 Thorvald Natvig <thorvald@natvig.com> *
Redistribution and use in source and binary forms, with or without * Copyright (C) 2012 by Retroshare Team <retroshare.project@gmail.com> *
modification, are permitted provided that the following conditions * *
are met: * This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
- Redistributions of source code must retain the above copyright notice, * published by the Free Software Foundation, either version 3 of the *
this list of conditions and the following disclaimer. * License, or (at your option) any later version. *
- Redistributions in binary form must reproduce the above copyright notice, * *
this list of conditions and the following disclaimer in the documentation * This program is distributed in the hope that it will be useful, *
and/or other materials provided with the distribution. * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- Neither the name of the Mumble Developers nor the names of its * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
contributors may be used to endorse or promote products derived from this * GNU Affero General Public License for more details. *
software without specific prior written permission. * *
* You should have received a copy of the GNU Affero General Public License *
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * along with this program. If not, see <https://www.gnu.org/licenses/>. *
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * *
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *******************************************************************************/
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once #pragma once