diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2015-04-26 11:27:38 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2015-04-26 11:27:38 +0000 |
| commit | 1daece9859332aca46217ac48727d71e8f8c5661 (patch) | |
| tree | 15f765a080b09db2033699bbcae02d19c406b1d5 /protocols | |
| parent | 4adcfa326ef4592aceaeae95f89449dcdd9f7c3d (diff) | |
Tox - adding to solution fix + warnings fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@13162 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Tox/Tox.vcxproj | 18 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_multimedia.cpp | 5 |
2 files changed, 20 insertions, 3 deletions
diff --git a/protocols/Tox/Tox.vcxproj b/protocols/Tox/Tox.vcxproj index c8d45cedb0..eb5d59194d 100644 --- a/protocols/Tox/Tox.vcxproj +++ b/protocols/Tox/Tox.vcxproj @@ -1,5 +1,23 @@ <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{BCFAB658-326E-466D-995B-E76636C1DEA4}</ProjectGuid>
<ProjectName>Tox</ProjectName>
diff --git a/protocols/Tox/src/tox_multimedia.cpp b/protocols/Tox/src/tox_multimedia.cpp index 3c8dded1b8..29c3e5b398 100644 --- a/protocols/Tox/src/tox_multimedia.cpp +++ b/protocols/Tox/src/tox_multimedia.cpp @@ -312,7 +312,7 @@ INT_PTR CToxProto::OnRecvAudioCall(WPARAM hContact, LPARAM lParam) }
// react on clist event click
-INT_PTR CToxProto::OnAudioRing(WPARAM wParam, LPARAM lParam)
+INT_PTR CToxProto::OnAudioRing(WPARAM, LPARAM lParam)
{
CLISTEVENT *cle = (CLISTEVENT*)lParam;
CDlgBase *incomingCallDlg = new CToxIncomingCall(this, cle->hContact);
@@ -342,7 +342,6 @@ void CToxProto::OnAvCancel(void*, int32_t callId, void *arg) return;
}
- int iEvent = 0;
CLISTEVENT *cle = NULL;
while ((cle = (CLISTEVENT*)CallService(MS_CLIST_GETEVENT, hContact, 0)))
{
@@ -584,7 +583,7 @@ void CToxProto::OnAvPeerTimeout(void*, int32_t callId, void *arg) //////
-void CToxProto::OnFriendAudio(void*, int32_t callId, const int16_t *PCM, uint16_t size, void *arg)
+void CToxProto::OnFriendAudio(void*, int32_t, const int16_t *PCM, uint16_t size, void *arg)
{
CToxProto *proto = (CToxProto*)arg;
|