owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP, Remote Client/Server, Reworking cover art retreival. To be tested

Browse Source
This commit is contained in:
emeric
2014-06-10 00:16:07 +02:00
parent d6ad178bdb
commit ca88d82677
17 changed files with 1799 additions and 933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Makefile.am
+1
View File
@@ -12,6 +12,7 @@ remote_SOURCES = \
$(top_srcdir)/av/FormatContext.cpp \
$(top_srcdir)/av/InputFormatContext.cpp \
$(top_srcdir)/av/Stream.cpp \
$(top_srcdir)/cover/CoverArtGrabber.cpp \
$(top_srcdir)/remote/server/Server.cpp \
$(top_srcdir)/remote/server/RequestHandler.cpp \
$(top_srcdir)/remote/server/AudioCollectionRequestHandler.cpp \
test/Makefile.in
+18 -1
View File
@@ -124,7 +124,8 @@ am_remote_OBJECTS = remote-RemoteClientServer.$(OBJEXT) \
remote-Common.$(OBJEXT) remote-Dictionary.$(OBJEXT) \
remote-FormatContext.$(OBJEXT) \
remote-InputFormatContext.$(OBJEXT) remote-Stream.$(OBJEXT) \
remote-Server.$(OBJEXT) remote-RequestHandler.$(OBJEXT) \
remote-CoverArtGrabber.$(OBJEXT) remote-Server.$(OBJEXT) \
remote-RequestHandler.$(OBJEXT) \
remote-AudioCollectionRequestHandler.$(OBJEXT) \
remote-MediaRequestHandler.$(OBJEXT) \
remote-ConnectionManager.$(OBJEXT) remote-Connection.$(OBJEXT) \
@@ -510,6 +511,7 @@ remote_SOURCES = \
$(top_srcdir)/av/FormatContext.cpp \
$(top_srcdir)/av/InputFormatContext.cpp \
$(top_srcdir)/av/Stream.cpp \
$(top_srcdir)/cover/CoverArtGrabber.cpp \
$(top_srcdir)/remote/server/Server.cpp \
$(top_srcdir)/remote/server/RequestHandler.cpp \
$(top_srcdir)/remote/server/AudioCollectionRequestHandler.cpp \
@@ -655,6 +657,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-Common.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-Connection.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-ConnectionManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-CoverArtGrabber.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-DatabaseHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-Dictionary.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-Format.Po@am__quote@
@@ -1088,6 +1091,20 @@ remote-Stream.obj: $(top_srcdir)/av/Stream.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-Stream.obj `if test -f '$(top_srcdir)/av/Stream.cpp'; then $(CYGPATH_W) '$(top_srcdir)/av/Stream.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/av/Stream.cpp'; fi`
remote-CoverArtGrabber.o: $(top_srcdir)/cover/CoverArtGrabber.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-CoverArtGrabber.o -MD -MP -MF $(DEPDIR)/remote-CoverArtGrabber.Tpo -c -o remote-CoverArtGrabber.o `test -f '$(top_srcdir)/cover/CoverArtGrabber.cpp' || echo '$(srcdir)/'`$(top_srcdir)/cover/CoverArtGrabber.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-CoverArtGrabber.Tpo $(DEPDIR)/remote-CoverArtGrabber.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/cover/CoverArtGrabber.cpp' object='remote-CoverArtGrabber.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-CoverArtGrabber.o `test -f '$(top_srcdir)/cover/CoverArtGrabber.cpp' || echo '$(srcdir)/'`$(top_srcdir)/cover/CoverArtGrabber.cpp
remote-CoverArtGrabber.obj: $(top_srcdir)/cover/CoverArtGrabber.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-CoverArtGrabber.obj -MD -MP -MF $(DEPDIR)/remote-CoverArtGrabber.Tpo -c -o remote-CoverArtGrabber.obj `if test -f '$(top_srcdir)/cover/CoverArtGrabber.cpp'; then $(CYGPATH_W) '$(top_srcdir)/cover/CoverArtGrabber.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/cover/CoverArtGrabber.cpp'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-CoverArtGrabber.Tpo $(DEPDIR)/remote-CoverArtGrabber.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/cover/CoverArtGrabber.cpp' object='remote-CoverArtGrabber.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-CoverArtGrabber.obj `if test -f '$(top_srcdir)/cover/CoverArtGrabber.cpp'; then $(CYGPATH_W) '$(top_srcdir)/cover/CoverArtGrabber.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/cover/CoverArtGrabber.cpp'; fi`
remote-Server.o: $(top_srcdir)/remote/server/Server.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-Server.o -MD -MP -MF $(DEPDIR)/remote-Server.Tpo -c -o remote-Server.o `test -f '$(top_srcdir)/remote/server/Server.cpp' || echo '$(srcdir)/'`$(top_srcdir)/remote/server/Server.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-Server.Tpo $(DEPDIR)/remote-Server.Po
test/RemoteClientServer.cpp
+9 -3
View File
@@ -584,15 +584,15 @@ int main()
Av::AvInit();
Transcode::AvConvTranscoder::init();
bool extendedTests = false;
bool extendedTests = true;
// Runs in its own thread
// Listen on any
TestServer testServer( boost::asio::ip::tcp::endpoint( boost::asio::ip::tcp::v4(), 5080));
TestServer testServer( boost::asio::ip::tcp::endpoint( boost::asio::ip::tcp::v4(), 5081));
// Client
// connect to loopback
TestClient client( boost::asio::ip::tcp::endpoint( boost::asio::ip::address_v4::loopback(), 5080));
TestClient client( boost::asio::ip::tcp::endpoint( boost::asio::ip::address_v4::loopback(), 5081));
// ****** Artists *********
std::vector<ArtistInfo> artists;
@@ -615,6 +615,12 @@ int main()
client.getReleases(releases, std::vector<uint64_t>(1, 1162));
BOOST_FOREACH(const ReleaseInfo& release, releases)
std::cout << "Release: '" << release << "'" << std::endl;
{
std::vector<ReleaseInfo> releases;
client.getReleases(releases, std::vector<uint64_t>());
BOOST_FOREACH(const ReleaseInfo& release, releases)
std::cout << "Release: '" << release << "'" << std::endl;
}
// **** Tracks ******
{