Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/master' into channelrecord

  • Loading branch information
bear101 committed Feb 8, 2020
2 parents 8c8b293 + e608059 commit 6ead25ce44aaec4d8669320fa602b24061e695dd
@@ -27,19 +27,19 @@
android:icon="@drawable/teamtalk_blue"
android:label="@string/app_name"
android:usesCleartextTraffic="true">

<activity
android:name=".WebLoginActivity"
android:label="@string/title_activity_web_login"
android:theme="@style/AppTheme.NoActionBar">
</activity>

<activity
android:name=".ServerListActivity"
android:icon="@drawable/teamtalk_blue"
android:label="@string/title_activity_server_list"
android:launchMode="singleTop">

<!-- -->

<intent-filter>
<action android:name="android.intent.action.MAIN" />

@@ -54,29 +54,39 @@
<data android:scheme="tt" />
</intent-filter>
</activity>

<activity
android:name=".ServerEntryActivity"
android:label="@string/title_activity_server_entry"></activity>
android:label="@string/title_activity_server_entry">
</activity>

<activity
android:name=".MainActivity"
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_main"
android:launchMode="singleTop"
android:windowSoftInputMode="stateUnchanged|adjustResize"></activity>
android:windowSoftInputMode="stateUnchanged|adjustResize">
</activity>

<activity
android:name=".ChannelPropActivity"
android:label="@string/title_activity_channel_prop"></activity>
android:label="@string/title_activity_channel_prop">
</activity>

<activity
android:name=".StreamMediaActivity"
android:label="@string/title_activity_stream_media"></activity>
android:label="@string/title_activity_stream_media">
</activity>

<service
android:name="dk.bearware.backend.TeamTalkService"
android:stopWithTask="true" />

<activity
android:name=".UserPropActivity"
android:label="@string/title_activity_user_prop"></activity>
android:label="@string/title_activity_user_prop">
</activity>

<activity
android:name=".TextMessageActivity"
android:label="@string/title_activity_text_message"
@@ -85,28 +95,37 @@
android:name="android.support.PARENT_ACTIVITY"
android:value="dk.bearware.gui.MainActivity" />
</activity>

<activity
android:name=".PreferencesActivity"
android:label="@string/title_activity_preferences"></activity>
android:label="@string/title_activity_preferences">
</activity>

<activity
android:name=".AudioCodecActivity"
android:label="@string/title_activity_audio_codec"></activity>
android:label="@string/title_activity_audio_codec">
</activity>

<activity
android:name=".FilePickerActivity"
android:label="@string/title_activity_filepicker"></activity>
android:label="@string/title_activity_filepicker">
</activity>

<receiver android:name=".MediaButtonEventReceiver">
<intent-filter android:priority="2147483647">
<action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter>
</receiver> <!-- Facebook begin -->
</receiver>

<!-- Facebook begin -->
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" /> <!-- Facebook end -->
android:value="@string/facebook_app_id" />
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="TeamTalk"></activity>
android:label="TeamTalk">
</activity>
<activity
android:name="com.facebook.CustomTabActivity"
android:exported="true">
@@ -119,6 +138,7 @@
<data android:scheme="@string/fb_login_protocol_scheme" />
</intent-filter>
</activity>
<!-- Facebook end -->
</application>

</manifest>
@@ -1523,8 +1523,8 @@ IDR_MAINFRAME ICON "res\\TeamTalk.ico"
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,5,0,4985
PRODUCTVERSION 5,5,0,4985
FILEVERSION 5,5,0,4987
PRODUCTVERSION 5,5,0,4987
FILEFLAGSMASK 0x1fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -1541,12 +1541,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "BearWare.dk"
VALUE "FileDescription", "TeamTalk voice conferencing client"
VALUE "FileVersion", "5, 5, 0, 4985"
VALUE "FileVersion", "5, 5, 0, 4987"
VALUE "InternalName", "TeamTalk5.exe"
VALUE "LegalCopyright", "Copyright (c) 2005-2018, BearWare.dk. All rights reserved."
VALUE "OriginalFilename", "TeamTalk5.exe"
VALUE "ProductName", "BearWare.dk TeamTalk"
VALUE "ProductVersion", "5, 5, 0, 4985"
VALUE "ProductVersion", "5, 5, 0, 4987"
END
END
BLOCK "VarFileInfo"
@@ -53,8 +53,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,5,0,4985
PRODUCTVERSION 5,5,0,4985
FILEVERSION 5,5,0,4987
PRODUCTVERSION 5,5,0,4987
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -72,21 +72,21 @@ BEGIN
#ifdef ENABLE_TEAMTALKPRO
VALUE "CompanyName", "BearWare.dk"
VALUE "FileDescription", "TeamTalk 5 Encrypted Conferencing Client"
VALUE "FileVersion", "5, 5, 0, 4985"
VALUE "FileVersion", "5, 5, 0, 4987"
VALUE "InternalName", "TeamTalk 5 Professional"
VALUE "LegalCopyright", "Copyright (c) 2005-2018, BearWare.dk. All rights reserved."
VALUE "OriginalFilename", "TeamTalk5Pro.exe"
VALUE "ProductName", "BearWare.dk TeamTalk 5 Professional"
VALUE "ProductVersion", "5, 5, 0, 4985"
VALUE "ProductVersion", "5, 5, 0, 4987"
#else
VALUE "CompanyName", "BearWare.dk"
VALUE "FileDescription", "TeamTalk Conferencing Client"
VALUE "FileVersion", "5, 5, 0, 4985"
VALUE "FileVersion", "5, 5, 0, 4987"
VALUE "InternalName", "TeamTalk 5"
VALUE "LegalCopyright", "Copyright (c) 2005-2018, BearWare.dk. All rights reserved."
VALUE "OriginalFilename", "TeamTalk5.exe"
VALUE "ProductName", "BearWare.dk TeamTalk 5"
VALUE "ProductVersion", "5, 5, 0, 4985"
VALUE "ProductVersion", "5, 5, 0, 4987"
#endif
END
END
@@ -38,7 +38,7 @@ PROJECT_NAME = "TeamTalk Help"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "Version 5.5.0.4985"
PROJECT_NUMBER = "Version 5.5.0.4987"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -38,7 +38,7 @@ PROJECT_NAME = "TeamTalk 5 Java DLL"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "Version 5.5.0.4985 - Unreleased"
PROJECT_NUMBER = "Version 5.5.0.4987 - Unreleased"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -38,7 +38,7 @@ PROJECT_NAME = "TeamTalk 5 .NET DLL"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "Version 5.5.0.4985 - Unreleased"
PROJECT_NUMBER = "Version 5.5.0.4987 - Unreleased"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -38,7 +38,7 @@ PROJECT_NAME = "TeamTalk 5 C-API DLL"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "Version 5.5.0.4985 - Unreleased"
PROJECT_NUMBER = "Version 5.5.0.4987 - Unreleased"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -58,5 +58,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("5.5.0.4985")]
[assembly: AssemblyVersion("5.5.0.4987")]

@@ -1499,6 +1499,38 @@ public void test_MuxedAudioBlock() throws IOException {
} while (receiveSamples > 0);
}

public void testUserEventMuxedStream() {
String USERNAME = "tt_test", PASSWORD = "tt_test", NICKNAME = "jUnit - " + getCurrentMethod();
int USERRIGHTS = UserRight.USERRIGHT_CREATE_TEMPORARY_CHANNEL |
UserRight.USERRIGHT_TRANSMIT_VOICE | UserRight.USERRIGHT_MULTI_LOGIN;
makeUserAccount(NICKNAME, USERNAME, PASSWORD, USERRIGHTS);

TeamTalkBase rxclient = newClientInstance();
TeamTalkBase txclient = newClientInstance();

TTMessage msg = new TTMessage();

connect(rxclient);
initSound(rxclient);
login(rxclient, NICKNAME, USERNAME, PASSWORD);
joinRoot(rxclient);

connect(txclient);
initSound(txclient);
login(txclient, NICKNAME, USERNAME, PASSWORD);
joinRoot(txclient);

assertTrue("enable aud cb", rxclient.enableAudioBlockEvent(Constants.TT_MUXED_USERID, StreamType.STREAMTYPE_VOICE, true));
assertTrue("gimme voice audioblock", waitForEvent(rxclient, ClientEvent.CLIENTEVENT_USER_AUDIOBLOCK, DEF_WAIT, msg));
assertTrue("enable tx", txclient.enableVoiceTransmission(true));
assertTrue("User state changed to voice", waitForEvent(rxclient, ClientEvent.CLIENTEVENT_USER_STATECHANGE, DEF_WAIT, msg));
assertTrue("User is talking", (msg.user.uUserState & UserState.USERSTATE_VOICE) == UserState.USERSTATE_VOICE);
assertTrue("gimme voice audioblock again", waitForEvent(rxclient, ClientEvent.CLIENTEVENT_USER_AUDIOBLOCK, DEF_WAIT, msg));
assertTrue("disable tx", txclient.enableVoiceTransmission(false));
assertTrue("User state changed to no voice", waitForEvent(rxclient, ClientEvent.CLIENTEVENT_USER_STATECHANGE, DEF_WAIT, msg));
assertTrue("User stopped talking", (msg.user.uUserState & UserState.USERSTATE_VOICE) == UserState.USERSTATE_NONE);
}

public void testOpusFrameSizeMSec() {

String USERNAME = "tt_test", PASSWORD = "tt_test", NICKNAME = "jUnit - " + getCurrentMethod();
@@ -24,9 +24,9 @@
#if !defined(TEAMTALKDEFS_H)
#define TEAMTALKDEFS_H

#define TEAMTALK_VERSION "5.5.0.4985"
#define TEAMTALK_RC_VERSION 5,5,0,4985
#define TEAMTALK_RC_FILEVERSION "5, 5, 0, 4985"
#define TEAMTALK_VERSION "5.5.0.4987"
#define TEAMTALK_RC_VERSION 5,5,0,4987
#define TEAMTALK_RC_FILEVERSION "5, 5, 0, 4987"
#define TEAMTALK_VERSION_POSTFIX " - Unreleased"

#if defined(ENABLE_TEAMTALKPRO)
@@ -48,10 +48,13 @@ vidcap_devices_t MFCapture::GetDevices()
HRESULT hr;
CComPtr<IMFAttributes> pAttributes;
hr = MFCreateAttributes(&pAttributes, 1);
assert(SUCCEEDED(hr));
if (FAILED(hr))
return devs;

hr = pAttributes->SetGUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE,
MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID);
assert(SUCCEEDED(hr));
if (FAILED(hr))
return devs;

// Enumerate devices.
UINT32 cDevices = 0;
@@ -65,15 +68,18 @@ vidcap_devices_t MFCapture::GetDevices()
// open source to get capture formats
CComPtr<IMFMediaSource> pSource;
hr = pDevice->ActivateObject(IID_PPV_ARGS(&pSource));
assert(SUCCEEDED(hr));
if (FAILED(hr))
continue;

CComPtr<IMFAttributes> pReaderAttributes;
hr = MFCreateAttributes(&pReaderAttributes, 2);
assert(SUCCEEDED(hr));
if (FAILED(hr))
continue;

CComPtr<IMFSourceReader> pReader;
hr = MFCreateSourceReaderFromMediaSource(pSource, pReaderAttributes, &pReader);
assert(SUCCEEDED(hr));
if (FAILED(hr))
continue;

// Get native media type of device
CComPtr<IMFMediaType> pInputType;
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2005-2018, BearWare.dk
*
*
* Contact Information:
*
* Bjoern D. Rasmussen
@@ -125,11 +125,12 @@ void TTMsgQueue::EnqueueMsg(ACE_Message_Block* mb)
IntTTMessage* msg = MakeMsgBlock(mb, CLIENTEVENT_INTERNAL_ERROR,
0, __CLIENTERRORMSG);
msg->clienterrmsg->nErrorNo = INTERR_TTMESSAGE_QUEUE_OVERFLOW;

ACE_OS::strsncpy(msg->clienterrmsg->szErrorMsg,
ACE_TEXT("The internal message queue has overflowed"),
TT_STRLEN);
m_event_queue.enqueue(mb, &tv);
ret = m_event_queue.enqueue(mb, &tv);
assert(ret >= 0);
}

#if defined(WIN32)
@@ -435,7 +436,7 @@ void TTMsgQueue::OnUserStateChange(const teamtalk::ClientUser& user)
{
ACE_Message_Block* mb;
IntTTMessage* msg = MakeMsgBlock(mb, CLIENTEVENT_USER_STATECHANGE,
0, __USER);
0, __USER);
Convert(user, *msg->user);
EnqueueMsg(mb);
}
@@ -531,7 +532,7 @@ void TTMsgQueue::OnUserAudioBlock(int userid, teamtalk::StreamType stream_type)
IntTTMessage* msg = MakeMsgBlock(mb, CLIENTEVENT_USER_AUDIOBLOCK,
userid, __STREAMTYPE);
*msg->streamtype = (StreamType)stream_type;
assert((StreamType)stream_type == STREAMTYPE_VOICE ||
assert((StreamType)stream_type == STREAMTYPE_VOICE ||
(StreamType)stream_type == STREAMTYPE_MEDIAFILE_AUDIO);
EnqueueMsg(mb);
}
@@ -546,8 +547,8 @@ void TTMsgQueue::OnMTUQueryComplete(int payload_size)
}

//VoiceLogListener
void TTMsgQueue::OnMediaFileStatus(int userid,
teamtalk::MediaFileStatus status,
void TTMsgQueue::OnMediaFileStatus(int userid,
teamtalk::MediaFileStatus status,
const teamtalk::VoiceLogFile& vlog)
{
ACE_Message_Block* mb;
@@ -36,7 +36,7 @@ HINSTANCE hInstance = NULL;
#endif

#if defined(ENABLE_MINIDUMP)
#include "mdump.h"
#include <win32/mdump.h>
#endif


0 comments on commit 6ead25c

Please sign in to comment.
You can’t perform that action at this time.