From 030f06cee222829635331aeeb535cb91e13b6c60 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 13 Feb 2015 19:55:54 +0100 Subject: [PATCH] libeplayer3: try to fix dynamic linking Conflicts: libeplayer3/Makefile.am libspark/Makefile.am Conflicts: libeplayer3/Makefile.am --- libduckbox/Makefile.am | 5 +++-- libeplayer3/Makefile.am | 15 ++++++++++----- libspark/Makefile.am | 8 ++++---- libspark/playback_libeplayer3.cpp | 4 ++-- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/libduckbox/Makefile.am b/libduckbox/Makefile.am index 189cb98..ce5df2e 100644 --- a/libduckbox/Makefile.am +++ b/libduckbox/Makefile.am @@ -8,11 +8,12 @@ AM_CPPFLAGS += \ AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing -AM_LDFLAGS = -lpthread -lasound -lass -lrt \ +AM_LDFLAGS = \ @AVFORMAT_LIBS@ \ @AVUTIL_LIBS@ \ @AVCODEC_LIBS@ \ - @SWRESAMPLE_LIBS@ + @SWRESAMPLE_LIBS@ \ + -lpthread -lasound -lass -lrt libduckbox_la_SOURCES = \ hardware_caps.c \ diff --git a/libeplayer3/Makefile.am b/libeplayer3/Makefile.am index 0a13524..602c42c 100644 --- a/libeplayer3/Makefile.am +++ b/libeplayer3/Makefile.am @@ -9,10 +9,15 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing libeplayer3_la_SOURCES = \ input.cpp output.cpp manager.cpp player.cpp \ - writer/writer.cpp writer/wmv.cpp writer/ac3.cpp writer/divx.cpp writer/pes.cpp \ - writer/dts.cpp writer/mpeg2.cpp writer/mp3.cpp writer/misc.cpp writer/h264.cpp \ - writer/h263.cpp writer/vc1.cpp writer/pcm.cpp -# writer/aac.cpp + writer/writer.cpp \ + writer/pes.cpp \ + writer/misc.cpp -LIBEPLAYER3_LIBS = libeplayer3.la -lpthread -lavformat -lavcodec -lavutil -lswresample -lm +# writer/wmv.cpp writer/ac3.cpp writer/divx.cpp +# writer/dts.cpp writer/mpeg2.cpp writer/mp3.cpp +# writer/h264.cpp +# writer/h263.cpp writer/vc1.cpp writer/pcm.cpp writer/aac.cpp + +LIBEPLAYER3_LIBS = libeplayer3.la +# -lpthread -lavformat -lavcodec -lavutil -lswresample -lm diff --git a/libspark/Makefile.am b/libspark/Makefile.am index 03a3caf..4b3e815 100644 --- a/libspark/Makefile.am +++ b/libspark/Makefile.am @@ -8,11 +8,13 @@ AM_CPPFLAGS += \ AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing -AM_LDFLAGS = -lpthread -lasound -lass -lrt \ +AM_LDFLAGS = \ + -lOpenThreads \ @AVFORMAT_LIBS@ \ @AVUTIL_LIBS@ \ @AVCODEC_LIBS@ \ - @SWRESAMPLE_LIBS@ + @SWRESAMPLE_LIBS@ \ + -lpthread -lasound -lass -lrt libspark_la_SOURCES = \ hardware_caps.c \ @@ -24,5 +26,3 @@ libspark_la_SOURCES = \ playback_libeplayer3.cpp \ pwrmngr.cpp \ record.cpp - -#AM_CPPFLAGS += -DF_INTERRUPTS=20000 -DIRMP_EMBED -DLIRC_IRMP diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp index 1acf0da..0f21ebb 100644 --- a/libspark/playback_libeplayer3.cpp +++ b/libspark/playback_libeplayer3.cpp @@ -244,10 +244,10 @@ bool cPlayback::GetPosition(int &position, int &duration) if (!player->isPlaying) { lt_info("%s !!!!EOF!!!! < -1\n", __func__); - position = duration; + position = duration + 1000; // duration = 0; // this is stupid - return true; + return false; } int64_t vpts = 0;