diff --git a/package/allwinner/tina_multimedia/libcedarx/libcore/playback/audioRenderComponent.c b/package/allwinner/tina_multimedia/libcedarx/libcore/playback/audioRenderComponent.c index 533ddcbd2..71b4c4664 100755 --- a/package/allwinner/tina_multimedia/libcedarx/libcore/playback/audioRenderComponent.c +++ b/package/allwinner/tina_multimedia/libcedarx/libcore/playback/audioRenderComponent.c @@ -151,7 +151,7 @@ AudioRenderComp* AudioRenderCompSetGain(AudioRenderComp* a, float gain){ int AudioRenderCompStart(AudioRenderComp* p) { //return BaseCompStart(&p->base, NULL, NULL); - return BaseCompStart(&p->base, NULL, &p->gain); + return BaseCompStartWithGain(&p->base, NULL, NULL, p->gain); } int AudioRenderCompStop(AudioRenderComp* p) diff --git a/package/allwinner/tina_multimedia/libcedarx/libcore/playback/baseComponent.c b/package/allwinner/tina_multimedia/libcedarx/libcore/playback/baseComponent.c index 55b4dd8b6..34fda44ee 100755 --- a/package/allwinner/tina_multimedia/libcedarx/libcore/playback/baseComponent.c +++ b/package/allwinner/tina_multimedia/libcedarx/libcore/playback/baseComponent.c @@ -86,7 +86,22 @@ int BaseCompStart(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg) .execute = p->handler.start, .replySem = &p->replySem[MESSAGE_ID_START], .result = &reply, - .gain = *((float*)arg), + }; + + BaseCompPostAndWait(p, &msg, afterPostBeforeWait, arg); + + return reply; +} + +int BaseCompStartWithGain(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg, float gain) +{ + int reply = 0; + AwMessage msg = { + .messageId = MESSAGE_ID_START, + .execute = p->handler.start, + .replySem = &p->replySem[MESSAGE_ID_START], + .result = &reply, + .gain = gain, }; BaseCompPostAndWait(p, &msg, afterPostBeforeWait, arg); diff --git a/package/allwinner/tina_multimedia/libcedarx/libcore/playback/baseComponent.h b/package/allwinner/tina_multimedia/libcedarx/libcore/playback/baseComponent.h index dded312c1..3eee54dfa 100755 --- a/package/allwinner/tina_multimedia/libcedarx/libcore/playback/baseComponent.h +++ b/package/allwinner/tina_multimedia/libcedarx/libcore/playback/baseComponent.h @@ -92,6 +92,8 @@ typedef void (*task_t)(void *); int BaseCompStart(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg); +int BaseCompStartWithGain(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg, float gain); + int BaseCompStop(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg); int BaseCompPause(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg); diff --git a/package/netease/KPlayer/Makefile b/package/netease/KPlayer/Makefile old mode 100644 new mode 100755 index 11a71ccf5..035da3a63 --- a/package/netease/KPlayer/Makefile +++ b/package/netease/KPlayer/Makefile @@ -14,7 +14,7 @@ define Package/$(PKG_NAME) SECTION:=utils CATEGORY:=Netease TITLE:=$(PKG_NAME)(compatible with DLNA) - DEPENDS:=+liballwinner +libmad +libstdcpp +KPlatinum +libjson-c $(MAKE_COMMON_DEPEND) + DEPENDS:=+liballwinner +libstdcpp +KPlatinum +libjson-c $(MAKE_COMMON_DEPEND) endef define Package/$(PKG_NAME)/description diff --git a/package/netease/KPlayerTest/Makefile b/package/netease/KPlayerTest/Makefile old mode 100644 new mode 100755 index 8f025e1c1..6d0649d54 --- a/package/netease/KPlayerTest/Makefile +++ b/package/netease/KPlayerTest/Makefile @@ -15,7 +15,7 @@ define Package/$(PKG_NAME) SECTION:=utils CATEGORY:=Netease TITLE:=$(PKG_NAME) app - DEPENDS:=+liballwinner +libmad +libstdcpp +KPlatinum +libjson-c $(MAKE_COMMON_DEPEND) + DEPENDS:=+liballwinner +libstdcpp +KPlatinum +libjson-c $(MAKE_COMMON_DEPEND) endef define Package/$(PKG_NAME)/description diff --git a/package/netease/SPlayer/Makefile b/package/netease/SPlayer/Makefile old mode 100644 new mode 100755 index 924b874a5..cbbe76466 --- a/package/netease/SPlayer/Makefile +++ b/package/netease/SPlayer/Makefile @@ -6,7 +6,7 @@ DEMO_NAME:=SPlayer-demo PKG_VERSION:=1 PKG_RELEASE:=1 -ALLDEPENDS := +liballwinner +libmad +libstdcpp +libjson-c +sraop +libavahi-compat-libdnssd +mdnsresponder +alsa-lib $(MAKE_COMMON_DEPEND) +ALLDEPENDS := +liballwinner +libstdcpp +libjson-c +sraop +libavahi-compat-libdnssd +mdnsresponder +alsa-lib $(MAKE_COMMON_DEPEND) PKG_BUILD_DIR := $(COMPILE_DIR)/$(PKG_NAME) DEMO_BUILD_DIR := $(COMPILE_DIR)/$(DEMO_NAME) diff --git a/package/netease/blueKC/Makefile b/package/netease/blueKC/Makefile old mode 100644 new mode 100755 index 0f2851019..7c4d5aecf --- a/package/netease/blueKC/Makefile +++ b/package/netease/blueKC/Makefile @@ -5,7 +5,7 @@ DEMO_NAME:=blueKC-demo PKG_VERSION:=1 PKG_RELEASE:=1 -ALLDEPENDS := +curl +liballwinner +libmad +libpthread +libstdcpp +libdbus +libuv +libjson-c +libuvdbus +libs2json +libcjson +libsqlite3 +ALLDEPENDS := +curl +liballwinner +libpthread +libstdcpp +libdbus +libuv +libjson-c +libuvdbus +libs2json +libcjson +libsqlite3 PKG_BUILD_DIR := $(COMPILE_DIR)/$(PKG_NAME) DEMO_BUILD_DIR := $(COMPILE_DIR)/$(DEMO_NAME) diff --git a/package/netease/ihw_player/Makefile b/package/netease/ihw_player/Makefile index 93c743f0f..1d87c6161 100755 --- a/package/netease/ihw_player/Makefile +++ b/package/netease/ihw_player/Makefile @@ -16,7 +16,7 @@ define Package/$(PKG_NAME) SECTION:=utils CATEGORY:=Netease TITLE:=$(PKG_NAME) app - DEPENDS:=+netease_voice +libmad +libjson-c +cppunit +libuws +libspeech +libcedarx +alsa-utils +libuapi $(MAKE_COMMON_DEPEND) + DEPENDS:=+netease_voice +libjson-c +cppunit +libuws +libspeech +libcedarx +alsa-utils +libuapi $(MAKE_COMMON_DEPEND) ifeq ('$(CONFIG_XUNFEI_TTS_SDK)_$(CONFIG_TTS_TEXT_XUNFEI)', 'y_y') DEPENDS+=+libmsc endif diff --git a/package/netease/submodules b/package/netease/submodules index d7b425483..702ee4d77 160000 --- a/package/netease/submodules +++ b/package/netease/submodules @@ -1 +1 @@ -Subproject commit d7b4254835e164235d99c3aa45cd219f69a1ca8b +Subproject commit 702ee4d770310b2c865fc21ff1ee5f33e7bcb4c8 diff --git a/package/netease/wifiDemo/Makefile b/package/netease/wifiDemo/Makefile old mode 100644 new mode 100755 index affc7cb21..6b8d8381c --- a/package/netease/wifiDemo/Makefile +++ b/package/netease/wifiDemo/Makefile @@ -15,7 +15,7 @@ define Package/$(PKG_NAME) SECTION:=utils CATEGORY:=Netease TITLE:=$(PKG_NAME) app - DEPENDS:=+liballwinner +libmad +libstdcpp +libjson-c $(MAKE_COMMON_DEPEND) + DEPENDS:=+liballwinner +libstdcpp +libjson-c $(MAKE_COMMON_DEPEND) endef define Package/$(PKG_NAME)/description diff --git a/package/netease/wirelessTest/Makefile b/package/netease/wirelessTest/Makefile old mode 100644 new mode 100755 index 708d9859f..e86df37aa --- a/package/netease/wirelessTest/Makefile +++ b/package/netease/wirelessTest/Makefile @@ -6,7 +6,7 @@ DEMO_NAME:=wirelessTest-demo PKG_VERSION:=1 PKG_RELEASE:=1 -ALLDEPENDS := +liballwinner +libmad +libstdcpp +libjson-c $(MAKE_COMMON_DEPEND) +ALLDEPENDS := +liballwinner +libstdcpp +libjson-c $(MAKE_COMMON_DEPEND) PKG_BUILD_DIR := $(COMPILE_DIR)/$(PKG_NAME) DEMO_BUILD_DIR := $(COMPILE_DIR)/$(DEMO_NAME) diff --git a/target/allwinner/mandolin-pv1c/defconfig b/target/allwinner/mandolin-pv1c/defconfig index 4c3240ba9..9a7e27d04 100644 --- a/target/allwinner/mandolin-pv1c/defconfig +++ b/target/allwinner/mandolin-pv1c/defconfig @@ -1538,7 +1538,7 @@ CONFIG_PACKAGE_softap-demo=y # CONFIG_PACKAGE_tina-app-upgrade is not set # CONFIG_PACKAGE_tina-upgrade is not set # CONFIG_PACKAGE_tinacvr is not set -CONFIG_PACKAGE_tinymp3=y +# CONFIG_PACKAGE_tinymp3 is not set # CONFIG_PACKAGE_tsc_demo is not set # CONFIG_PACKAGE_uevent-monitor is not set # CONFIG_PACKAGE_usb-gadget is not set @@ -2516,7 +2516,7 @@ CONFIG_PACKAGE_libjson-c=y # CONFIG_PACKAGE_liblua is not set # CONFIG_PACKAGE_liblz4 is not set # CONFIG_PACKAGE_liblzo is not set -CONFIG_PACKAGE_libmad=y +# CONFIG_PACKAGE_libmad is not set # CONFIG_PACKAGE_libmcrypt is not set # CONFIG_PACKAGE_libmicrohttpd is not set # CONFIG_PACKAGE_libmijia is not set @@ -2663,28 +2663,28 @@ CONFIG_PACKAGE_zlib=y # # Translations # -# CONFIG_LUCI_LANG_uk is not set # CONFIG_LUCI_LANG_hu is not set # CONFIG_LUCI_LANG_pt is not set -# CONFIG_LUCI_LANG_ro is not set +# CONFIG_LUCI_LANG_sk is not set +# CONFIG_LUCI_LANG_no is not set # CONFIG_LUCI_LANG_en is not set # CONFIG_LUCI_LANG_pl is not set -# CONFIG_LUCI_LANG_sk is not set -# CONFIG_LUCI_LANG_ja is not set +# CONFIG_LUCI_LANG_uk is not set +# CONFIG_LUCI_LANG_ru is not set # CONFIG_LUCI_LANG_vi is not set # CONFIG_LUCI_LANG_he is not set -# CONFIG_LUCI_LANG_no is not set +# CONFIG_LUCI_LANG_ro is not set # CONFIG_LUCI_LANG_ms is not set # CONFIG_LUCI_LANG_zh-cn is not set # CONFIG_LUCI_LANG_de is not set # CONFIG_LUCI_LANG_zh-tw is not set # CONFIG_LUCI_LANG_tr is not set # CONFIG_LUCI_LANG_sv is not set -# CONFIG_LUCI_LANG_ru is not set -# CONFIG_LUCI_LANG_pt-br is not set +# CONFIG_LUCI_LANG_ja is not set # CONFIG_LUCI_LANG_el is not set # CONFIG_LUCI_LANG_ca is not set # CONFIG_LUCI_LANG_es is not set +# CONFIG_LUCI_LANG_pt-br is not set # CONFIG_LUCI_LANG_cs is not set # CONFIG_LUCI_LANG_fr is not set # CONFIG_LUCI_LANG_it is not set