ShaYmez
/
xlxd
mirror of https://github.com/ShaYmez/xlxd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

amber 1.2.1 

corrected bug when pairing 3003+3000
added version reporting at startup
This commit is contained in:
LX3JL 2017-11-08 10:36:19 +01:00
parent 3f9555fe59
commit 384b6d41b1
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ambed/cftdidevicedescr.cpp
View File

@ -485,13 +485,18 @@ int CFtdiDeviceDescr::CreatePair(CUsb3003Interface *Usb3003A, CUsb3000Interface
Channel = new CVocodecChannel(Usb3003A, 1, Usb3003A, 0, CODECGAIN_AMBE2PLUS); Channel = new CVocodecChannel(Usb3003A, 1, Usb3003A, 0, CODECGAIN_AMBE2PLUS);
channels->push_back(Channel); channels->push_back(Channel);
Usb3003A->AddChannel(Channel); Usb3003A->AddChannel(Channel);
// ch5 // ch3
Channel = new CVocodecChannel(Usb3003A, 2, Usb3000B, 0, CODECGAIN_AMBEPLUS); Channel = new CVocodecChannel(Usb3003A, 2, Usb3000B, 0, CODECGAIN_AMBEPLUS);
channels->push_back(Channel); channels->push_back(Channel);
Usb3003A->AddChannel(Channel); Usb3003A->AddChannel(Channel);
Usb3000B->AddChannel(Channel); Usb3000B->AddChannel(Channel);
// ch4
Channel = new CVocodecChannel(Usb3000B, 2, Usb3003A, 2, CODECGAIN_AMBE2PLUS);
channels->push_back(Channel);
Usb3003A->AddChannel(Channel);
Usb3000B->AddChannel(Channel);
// done // done
nStreams = 6; nStreams = 4;
} }
} }
else else

2
ambed/main.cpp
View File

@ -97,7 +97,7 @@ int main(int argc, const char * argv[])
g_AmbeServer.SetListenIp(CIp(argv[1])); g_AmbeServer.SetListenIp(CIp(argv[1]));
// and let it run // and let it run
std::cout << "Starting AMBEd" << std::endl << std::endl; std::cout << "Starting AMBEd " << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_REVISION << std::endl << std::endl;
if ( !g_AmbeServer.Start() ) if ( !g_AmbeServer.Start() )
{ {
std::cout << "Error starting AMBEd" << std::endl; std::cout << "Error starting AMBEd" << std::endl;

2
ambed/main.h
View File

@ -49,7 +49,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_REVISION 0 #define VERSION_REVISION 1
// global ------------------------------------------------------ // global ------------------------------------------------------