danog/libtgvoip
1
0
Fork 0
mirror of https://github.com/danog/libtgvoip.git synced 2024-11-30 04:39:03 +01:00
Code Issues Projects Releases Wiki Activity

Finish moving

Browse Source
This commit is contained in:
Daniil Gentili 2020-01-22 12:54:35 +01:00
parent ef0a99fc8c
commit cf965341cf
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -59,7 +59,7 @@ video/Videocontroller/PacketSender.h \
video/VideoFEC.h \
video/VideoRenderer.h \
video/ScreamCongestionController.h \
json11.hpp \
tools/json11.hpp \
tools/utils.h
if TARGET_OS_OSX

12
Makefile.in
View File

@ -1439,8 +1439,8 @@ am__libtgvoip_la_SOURCES_DIST = TgVoip.cpp VoIPController.cpp \
audio/Resampler.h os/posix/NetworkSocketPosix.h \
video/VideoSource.h video/Videocontroller/PacketSender.h \
video/VideoFEC.h video/VideoRenderer.h \
video/ScreamCongestionController.h json11.hpp tools/utils.h \
os/darwin/AudioInputAudioUnit.h \
video/ScreamCongestionController.h tools/json11.hpp \
tools/utils.h os/darwin/AudioInputAudioUnit.h \
os/darwin/AudioOutputAudioUnit.h os/darwin/AudioUnitIO.h \
os/darwin/AudioInputAudioUnitOSX.h \
os/darwin/AudioOutputAudioUnitOSX.h os/darwin/DarwinSpecific.h \
@ -2187,8 +2187,8 @@ am__nobase_tgvoipinclude_HEADERS_DIST = TgVoip.h VoIPController.h \
audio/Resampler.h os/posix/NetworkSocketPosix.h \
video/VideoSource.h video/Videocontroller/PacketSender.h \
video/VideoFEC.h video/VideoRenderer.h \
video/ScreamCongestionController.h json11.hpp tools/utils.h \
os/darwin/AudioInputAudioUnit.h \
video/ScreamCongestionController.h tools/json11.hpp \
tools/utils.h os/darwin/AudioInputAudioUnit.h \
os/darwin/AudioOutputAudioUnit.h os/darwin/AudioUnitIO.h \
os/darwin/AudioInputAudioUnitOSX.h \
os/darwin/AudioOutputAudioUnitOSX.h os/darwin/DarwinSpecific.h \
@ -2403,8 +2403,8 @@ TGVOIP_HDRS = TgVoip.h VoIPController.h tools/Buffers.h \
audio/Resampler.h os/posix/NetworkSocketPosix.h \
video/VideoSource.h video/Videocontroller/PacketSender.h \
video/VideoFEC.h video/VideoRenderer.h \
video/ScreamCongestionController.h json11.hpp tools/utils.h \
$(am__append_2) $(am__append_5) $(am__append_7) \
video/ScreamCongestionController.h tools/json11.hpp \
tools/utils.h $(am__append_2) $(am__append_5) $(am__append_7) \
$(am__append_17)
libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS)
tgvoipincludedir = $(includedir)/tgvoip

4
VoIPController.cpp
View File

@ -19,9 +19,9 @@
#include "controller/audio/OpusDecoder.h"
#include "VoIPServerConfig.h"
#include "controller/PrivateDefines.h"
#include "json11.hpp"
#include "tools/json11.hpp"
#include "controller/PacketSender.h"
#include "video/Videocontroller/PacketSender.h"
#include "video/VideoPacketSender.h"
#include <assert.h>
#include <time.h>
#include <math.h>

2
VoIPServerConfig.h
View File

@ -11,7 +11,7 @@
#include <string>
#include <stdint.h>
#include "tools/threading.h"
#include "json11.hpp"
#include "tools/json11.hpp"
namespace tgvoip
{

2
libtgvoip.UWP.vcxproj
View File

@ -244,7 +244,7 @@
<ClInclude Include="controller/net/CongestionControl.h" />
<ClInclude Include="controller/audio/EchoCanceller.h" />
<ClInclude Include="controller/net/JitterBuffer.h" />
<ClInclude Include="json11.hpp" />
<ClInclude Include="tools/json11.hpp" />
<ClInclude Include="tools/logging.h" />
<ClInclude Include="controller/MediaStreamItf.h" />
<ClInclude Include="tools/MessageThread.h" />

2
libtgvoip.UWP.vcxproj.filters
View File

@ -1917,7 +1917,7 @@
<ClInclude Include="webrtc_dsp\modules\third_party\fft\fft.h">
<Filter>webrtc_dsp</Filter>
</ClInclude>
<ClInclude Include="json11.hpp" />
<ClInclude Include="tools/json11.hpp" />
<ClInclude Include="video\ScreamCongestionController.h">
<Filter>video</Filter>
</ClInclude>

2
libtgvoip.gyp
View File

@ -79,7 +79,7 @@
'<(tgvoip_src_loc)/video/VideoFEC.cpp',
'<(tgvoip_src_loc)/video/VideoFEC.h',
'<(tgvoip_src_loc)/tools/json11.cpp',
'<(tgvoip_src_loc)/json11.hpp',
'<(tgvoip_src_loc)/tools/json11.hpp',
# Windows
'<(tgvoip_src_loc)/os/windows/NetworkSocketWinsock.cpp',

4
tools/json11.cpp
View File

@ -19,7 +19,7 @@
* THE SOFTWARE.
*/
#include "json11.hpp"
#include "tools/json11.hpp"
#include <cassert>
#include <cmath>
#include <cstdlib>
@ -750,7 +750,7 @@ Json Json::parse(const string &in, string &err, JsonParse strategy) {
return result;
}
// Documented in json11.hpp
// Documented in tools/json11.hpp
vector<Json> Json::parse_multi(const string &in,
std::string::size_type &parser_stop_pos,
string &err,

2
video/VideoPacketSender.cpp
View File

@ -3,7 +3,7 @@
//
#include <algorithm>
#include "Videocontroller/PacketSender.h"
#include "VideoPacketSender.h"
#include "VideoFEC.h"
#include "../tools/logging.h"
#include "../controller/PrivateDefines.h"