Commit 6af72289 authored by Adrien Béraud's avatar Adrien Béraud

rename ringdht to jamidht

Change-Id: Id5673ba9f2ec519070cc112685dea5ced94c3b38
parent f8c5037e
This diff is collapsed.
......@@ -32,7 +32,7 @@
<Filter Include="Source Files\media\video">
<UniqueIdentifier>{79038082-1478-4202-923a-0af34dc8d704}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\ringdht">
<Filter Include="Source Files\jamidht">
<UniqueIdentifier>{44a8a1a1-b597-480e-92d9-77c76445a0bd}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\security">
......@@ -47,13 +47,13 @@
<Filter Include="Source Files\media\video\uwpvideo">
<UniqueIdentifier>{13ad5c25-d522-4562-8bab-f322fdd2a243}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\ringdht\eth">
<Filter Include="Source Files\jamidht\eth">
<UniqueIdentifier>{a351b980-057f-4e56-9b7f-4cbf27b49a7e}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\ringdht\eth\libdevcore">
<Filter Include="Source Files\jamidht\eth\libdevcore">
<UniqueIdentifier>{a39b6b13-7f71-4508-bbc8-20f69720f6af}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\ringdht\eth\libdevcrypto">
<Filter Include="Source Files\jamidht\eth\libdevcrypto">
<UniqueIdentifier>{c9a4b0a8-0da9-41d6-bb80-3fc1d31a2986}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\dring">
......@@ -169,11 +169,11 @@
<ClCompile Include="..\src\media\video\video_sender.cpp">
<Filter>Source Files\media\video</Filter>
</ClCompile>
<ClCompile Include="..\src\ringdht\jamiaccount.cpp">
<Filter>Source Files\ringdht</Filter>
<ClCompile Include="..\src\jamidht\jamiaccount.cpp">
<Filter>Source Files\jamidht</Filter>
</ClCompile>
<ClCompile Include="..\src\ringdht\sips_transport_ice.cpp">
<Filter>Source Files\ringdht</Filter>
<ClCompile Include="..\src\jamidht\sips_transport_ice.cpp">
<Filter>Source Files\jamidht</Filter>
</ClCompile>
<ClCompile Include="..\src\upnp\upnp_context.cpp">
<Filter>Source Files\upnp</Filter>
......@@ -241,29 +241,29 @@
<ClCompile Include="..\src\media\video\uwpvideo\video_device_monitor_impl.cpp">
<Filter>Source Files\media\video\uwpvideo</Filter>
</ClCompile>
<ClCompile Include="..\src\ringdht\eth\libdevcore\Common.cpp">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<ClCompile Include="..\src\jamidht\eth\libdevcore\Common.cpp">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClCompile>
<ClCompile Include="..\src\ringdht\eth\libdevcore\CommonData.cpp">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<ClCompile Include="..\src\jamidht\eth\libdevcore\CommonData.cpp">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClCompile>
<ClCompile Include="..\src\ringdht\eth\libdevcore\FixedHash.cpp">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<ClCompile Include="..\src\jamidht\eth\libdevcore\FixedHash.cpp">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClCompile>
<ClCompile Include="..\src\ringdht\eth\libdevcrypto\Common.cpp">
<Filter>Source Files\ringdht\eth\libdevcrypto</Filter>
<ClCompile Include="..\src\jamidht\eth\libdevcrypto\Common.cpp">
<Filter>Source Files\jamidht\eth\libdevcrypto</Filter>
</ClCompile>
<ClCompile Include="..\src\ringdht\namedirectory.cpp">
<Filter>Source Files\ringdht</Filter>
<ClCompile Include="..\src\jamidht\namedirectory.cpp">
<Filter>Source Files\jamidht</Filter>
</ClCompile>
<ClCompile Include="..\src\security\memory.cpp">
<Filter>Source Files\security</Filter>
</ClCompile>
<ClCompile Include="..\src\ringdht\accountarchive.cpp">
<Filter>Source Files\ringdht</Filter>
<ClCompile Include="..\src\jamidht\accountarchive.cpp">
<Filter>Source Files\jamidht</Filter>
</ClCompile>
<ClCompile Include="..\src\ringdht\eth\libdevcore\SHA3.cpp">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<ClCompile Include="..\src\jamidht\eth\libdevcore\SHA3.cpp">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClCompile>
<ClCompile Include="..\src\account.cpp">
<Filter>Source Files</Filter>
......@@ -364,8 +364,8 @@
<ClCompile Include="..\src\config\yamlparser.cpp">
<Filter>Source Files\config</Filter>
</ClCompile>
<ClCompile Include="..\src\ringdht\p2p.cpp">
<Filter>Source Files\ringdht</Filter>
<ClCompile Include="..\src\jamidht\p2p.cpp">
<Filter>Source Files\jamidht</Filter>
</ClCompile>
<ClCompile Include="..\src\media\video\accel.cpp">
<Filter>Source Files\media\video</Filter>
......@@ -573,47 +573,47 @@
<ClInclude Include="..\src\dring\videomanager_interface.h">
<Filter>Source Files\dring</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\eth\libdevcore\Address.h">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<ClInclude Include="..\src\jamidht\eth\libdevcore\Address.h">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\eth\libdevcore\Common.h">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<ClInclude Include="..\src\jamidht\eth\libdevcore\Common.h">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\eth\libdevcore\CommonData.h">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<ClInclude Include="..\src\jamidht\eth\libdevcore\CommonData.h">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\eth\libdevcore\FixedHash.h">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<ClInclude Include="..\src\jamidht\eth\libdevcore\FixedHash.h">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\eth\libdevcore\SHA3.h">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<ClInclude Include="..\src\jamidht\eth\libdevcore\SHA3.h">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\eth\libdevcore\vector_ref.h">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<ClInclude Include="..\src\jamidht\eth\libdevcore\vector_ref.h">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\eth\libdevcrypto\Common.h">
<Filter>Source Files\ringdht\eth\libdevcrypto</Filter>
<ClInclude Include="..\src\jamidht\eth\libdevcrypto\Common.h">
<Filter>Source Files\jamidht\eth\libdevcrypto</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\accountarchive.h">
<Filter>Source Files\ringdht</Filter>
<ClInclude Include="..\src\jamidht\accountarchive.h">
<Filter>Source Files\jamidht</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\configkeys.h">
<Filter>Source Files\ringdht</Filter>
<ClInclude Include="..\src\jamidht\configkeys.h">
<Filter>Source Files\jamidht</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\namedirectory.h">
<Filter>Source Files\ringdht</Filter>
<ClInclude Include="..\src\jamidht\namedirectory.h">
<Filter>Source Files\jamidht</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\p2p.h">
<Filter>Source Files\ringdht</Filter>
<ClInclude Include="..\src\jamidht\p2p.h">
<Filter>Source Files\jamidht</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\jamiaccount.h">
<Filter>Source Files\ringdht</Filter>
<ClInclude Include="..\src\jamidht\jamiaccount.h">
<Filter>Source Files\jamidht</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\ringcontact.h">
<Filter>Source Files\ringdht</Filter>
<ClInclude Include="..\src\jamidht\ringcontact.h">
<Filter>Source Files\jamidht</Filter>
</ClInclude>
<ClInclude Include="..\src\ringdht\sips_transport_ice.h">
<Filter>Source Files\ringdht</Filter>
<ClInclude Include="..\src\jamidht\sips_transport_ice.h">
<Filter>Source Files\jamidht</Filter>
</ClInclude>
<ClInclude Include="..\src\im\instant_messaging.h">
<Filter>Source Files\im</Filter>
......@@ -842,8 +842,8 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\src\ringdht\eth\libdevcore\Makefile.am">
<Filter>Source Files\ringdht\eth\libdevcore</Filter>
<None Include="..\src\jamidht\eth\libdevcore\Makefile.am">
<Filter>Source Files\jamidht\eth\libdevcore</Filter>
</None>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -652,9 +652,9 @@ AC_CONFIG_FILES([Makefile \
src/Makefile \
src/sip/Makefile \
src/im/Makefile \
src/ringdht/Makefile \
src/ringdht/eth/libdevcore/Makefile \
src/ringdht/eth/libdevcrypto/Makefile \
src/jamidht/Makefile \
src/jamidht/eth/libdevcore/Makefile \
src/jamidht/eth/libdevcrypto/Makefile \
src/media/Makefile \
src/media/audio/Makefile \
src/media/audio/pulseaudio/Makefile \
......
......@@ -27,7 +27,7 @@ ENABLE_VIDEO_LIBS+= \
endif
endif
SUBDIRS = client media config hooks sip upnp security ringdht im $(ENABLE_VIDEO_SUBDIR)
SUBDIRS = client media config hooks sip upnp security jamidht im $(ENABLE_VIDEO_SUBDIR)
# libring
......@@ -41,7 +41,7 @@ libring_la_LIBADD = \
./hooks/libhooks.la \
./security/libsecurity.la \
./upnp/libupnpcontrol.la \
./ringdht/libringacc.la \
./jamidht/libringacc.la \
./im/libim.la \
$(ENABLE_VIDEO_LIBS)
......
......@@ -25,7 +25,7 @@
#include "account_factory.h"
#include "sip/sipaccount.h"
#include "ringdht/jamiaccount.h"
#include "jamidht/jamiaccount.h"
#include <stdexcept>
......
......@@ -35,7 +35,7 @@
#include "archiver.h"
#include "ip_utils.h"
#include "sip/sipaccount.h"
#include "ringdht/jamiaccount.h"
#include "jamidht/jamiaccount.h"
#include "audio/audiolayer.h"
#include "system_codec_container.h"
#include "account_const.h"
......
......@@ -38,7 +38,7 @@
#include "client/ring_signal.h"
#include "compiler_intrinsics.h"
#include "ringdht/jamiaccount.h"
#include "jamidht/jamiaccount.h"
namespace DRing {
......
......@@ -21,7 +21,7 @@
#include "data_transfer.h"
#include "manager.h"
#include "ringdht/jamiaccount.h"
#include "jamidht/jamiaccount.h"
#include "peer_connection.h"
#include "fileutils.h"
#include "string_utils.h"
......
......@@ -2,7 +2,7 @@ include $(top_srcdir)/globals.mk
SUBDIRS = eth/libdevcore eth/libdevcrypto
AM_CPPFLAGS += -I$(top_srcdir)/src/ringdht/eth
AM_CPPFLAGS += -I$(top_srcdir)/src/jamidht/eth
noinst_LTLIBRARIES = libringacc.la
libringacc_la_CXXFLAGS = @CXXFLAGS@ @JSONCPP_CFLAGS@
......
include $(top_srcdir)/globals.mk
AM_CPPFLAGS += -I$(top_srcdir)/src/ringdht/eth
AM_CPPFLAGS += -I$(top_srcdir)/src/jamidht/eth
noinst_LTLIBRARIES = libdevcrypto.la
libdevcrypto_la_SOURCES = Common.cpp
......
......@@ -40,7 +40,7 @@
#include "map_utils.h"
#include "account.h"
#include "string_utils.h"
#include "ringdht/jamiaccount.h"
#include "jamidht/jamiaccount.h"
#include <opendht/rng.h>
using random_device = dht::crypto::random_device;
......
......@@ -25,7 +25,7 @@
#include "ice_transport.h"
#include "security/tls_session.h"
#include "ringdht/sips_transport_ice.h"
#include "jamidht/sips_transport_ice.h"
#include "array_size.h"
#include "compiler_intrinsics.h"
......
......@@ -32,7 +32,7 @@
#include "sipcall.h"
#include "sipaccount.h"
#include "ringdht/jamiaccount.h"
#include "jamidht/jamiaccount.h"
#include "manager.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment