eeva
/
jamulus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get rid of the name "llcon"

This commit is contained in:
Volker Fischer 2013-03-24 10:49:25 +00:00
parent 4ed34f5509
commit 196f0ff477
13 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Jamulus.pro
View File

@ -75,8 +75,8 @@ win32 {
RCC_DIR = src/res
RESOURCES += src/resources.qrc
FORMS += src/llconclientdlgbase.ui \
src/llconserverdlgbase.ui \
FORMS += src/clientdlgbase.ui \
src/serverdlgbase.ui \
src/clientsettingsdlgbase.ui \
src/chatdlgbase.ui \
src/connectdlgbase.ui \
@ -90,8 +90,8 @@ HEADERS += src/audiomixerboard.h \
src/clientsettingsdlg.h \
src/connectdlg.h \
src/global.h \
src/llconclientdlg.h \
src/llconserverdlg.h \
src/clientdlg.h \
src/serverdlg.h \
src/multicolorled.h \
src/multicolorledbar.h \
src/protocol.h \
@ -199,8 +199,8 @@ SOURCES += src/audiomixerboard.cpp \
src/client.cpp \
src/clientsettingsdlg.cpp \
src/connectdlg.cpp \
src/llconclientdlg.cpp \
src/llconserverdlg.cpp \
src/clientdlg.cpp \
src/serverdlg.cpp \
src/main.cpp \
src/multicolorled.cpp \
src/multicolorledbar.cpp \

2
src/channel.cpp
View File

@ -480,7 +480,7 @@ EPutDataStat CChannel::PutData ( const CVector<uint8_t>& vecbyData,
eRet = PS_PROT_ERR;
}
// all network packets except of valid llcon protocol messages
// all network packets except of valid protocol messages
// regardless if they are valid or invalid audio packets lead to
// a state change to a connected channel
// this is because protocol messages can only be sent on a

4
src/client.cpp
View File

@ -674,13 +674,13 @@ void CClient::Init()
{
// An unsupported sound card buffer size is currently used -> we have
// to use a conversion buffer. Per definition we use the smallest buffer
// size as llcon frame size
// size as the current frame size
// store actual sound card buffer size (stereo)
iSndCardMonoBlockSizeSamConvBuff = iMonoBlockSizeSam;
const int iSndCardStereoBlockSizeSamConvBuff = 2 * iMonoBlockSizeSam;
// overwrite block size by smallest supported llcon buffer size
// overwrite block size by smallest supported buffer size
iSndCrdFrameSizeFactor = FRAME_SIZE_FACTOR_PREFERRED;
iMonoBlockSizeSam =
SYSTEM_FRAME_SIZE_SAMPLES * FRAME_SIZE_FACTOR_PREFERRED;

2
src/clientdlg.cpp
View File

@ -22,7 +22,7 @@
*
\******************************************************************************/
#include "llconclientdlg.h"
#include "clientdlg.h"
/* Implementation *************************************************************/

2
src/clientdlg.h
View File

@ -42,7 +42,7 @@
#include "chatdlg.h"
#include "connectdlg.h"
#include "analyzerconsole.h"
#include "ui_llconclientdlgbase.h"
#include "ui_clientdlgbase.h"
/* Definitions ****************************************************************/

6
src/global.h
View File

@ -7,9 +7,9 @@
\section intro_sec Introduction
The llcon software enables musicians to perform real-time jam sessions over the
internet. There is one server running the llcon server software which collects
the audio data from each llcon client, mixes the audio data and sends the mix
The Jamulus software enables musicians to perform real-time jam sessions over the
internet. There is one server running the Jamulus server software which collects
the audio data from each Jamulus client, mixes the audio data and sends the mix
back to each client.

8
src/main.cpp
View File

@ -27,8 +27,8 @@
#include <QDir>
#include <QTextStream>
#include "global.h"
#include "llconclientdlg.h"
#include "llconserverdlg.h"
#include "clientdlg.h"
#include "serverdlg.h"
#include "settings.h"
#include "testbench.h"
@ -376,8 +376,8 @@ int main ( int argc, char** argv )
SetPriorityClass ( GetCurrentProcess(), HIGH_PRIORITY_CLASS );
// For accessible support we need to add a plugin to qt. The plugin has to
// be located in the install directory of llcon by the installer. Here, we
// set the path to our application
// be located in the install directory of the software by the installer.
// Here, we set the path to our application path.
QDir ApplDir ( QApplication::applicationDirPath() );
app.addLibraryPath ( QString ( ApplDir.absolutePath() ) );
#endif

4
src/server.cpp
View File

@ -39,7 +39,7 @@ CHighPrecisionTimer::CHighPrecisionTimer()
#endif
// Since QT only supports a minimum timer resolution of 1 ms but for our
// llcon server we require a timer interval of 2.333 ms for 128 samples
// server we require a timer interval of 2.333 ms for 128 samples
// frame size at 48 kHz sampling rate.
// To support this interval, we use a timer with 2 ms
// resolution and fire the actual frame timer if the error to the actual
@ -1284,7 +1284,7 @@ bool CServer::PutData ( const CVector<uint8_t>& vecbyRecBuf,
vecChannels[iCurChanID].CreateReqChanInfoMes();
// COMPATIBILITY ISSUE
// since old versions of the llcon software did not implement the channel name
// since old versions of the software did not implement the channel name
// request message, we have to explicitely send the channel list here
CreateAndSendChanListForAllConChannels();

2
src/serverdlg.cpp
View File

@ -22,7 +22,7 @@
*
\******************************************************************************/
#include "llconserverdlg.h"
#include "serverdlg.h"
/* Implementation *************************************************************/

2
src/serverdlg.h
View File

@ -37,7 +37,7 @@
#include "server.h"
#include "settings.h"
#include "multicolorled.h"
#include "ui_llconserverdlgbase.h"
#include "ui_serverdlgbase.h"
/* Definitions ****************************************************************/

6
src/serverlist.h
View File

@ -8,13 +8,13 @@
Currently, if you want to run a private server, you have to open the firewall of
your computer at the correct ports and introduce a port forwarding at your
router to get it work. Using a central server simplifies the process. The user
who wants to run a llcon server just registers his server a the central server
who wants to run a server just registers his server a the central server
and a mechanism implemented in the protocol opens the firewall similar to STUN.
REQUIREMENTS:
The client sets the URL of the central llcon server and can get a list of all
currently activated and registered private llcon servers. If the user clicks on
The client sets the URL of the central server and can get a list of all
currently activated and registered private servers. If the user clicks on
the server of his choice, he gets connected to this server.
The server list must be available in both cases: if the client is connected to

3
src/soundbase.cpp
View File

@ -191,8 +191,7 @@ QString CSoundBase::SetDev ( const int iNewDev )
// try to load the selected driver, if this fails, we try to load
// the first available driver in the system. If this fails, too, we
// throw an error that no driver is available -> it does not make
// sense to start the llcon software if no audio hardware is
// available.
// sense to start the software if no audio hardware is available.
if ( !LoadAndInitializeDriver ( iNewDev ).isEmpty() )
{
// loading and initializing the new driver failed, try to find

4
src/util.cpp
View File

@ -310,7 +310,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
// set the text for the about dialog html text control
txvCredits->setOpenExternalLinks ( true );
txvCredits->setText (
"<p>" // general description of llcon software
"<p>" // general description of software
"<big>" + tr( "The " ) + APP_NAME +
tr ( " software enables musicians to perform real-time jam sessions "
"over the internet. There is a " ) + APP_NAME + tr ( " "
@ -330,7 +330,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 "
"USA"
"</font></p><br>"
"<p><b>" + APP_NAME + // libraries used by this compilation of llcon
"<p><b>" + APP_NAME + // libraries used by this compilation
tr ( " uses the following libraries, resources or code snippets:" ) +
"</b></p>"
"<ul>"