Skip to content

Commit bf5a89c

Browse files
committed
add usbdifi
1 parent 2b30ecd commit bf5a89c

File tree

14 files changed

+1331
-8
lines changed

14 files changed

+1331
-8
lines changed

Application.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ APP_MODULES += libParticleOmxil-prebuild
5959
APP_MODULES += libParticleOmxal-prebuild
6060

6161
APP_MODULES += MangoPlayer
62-
62+
APP_MODULES += usbhifi

apps/player/Android.mk

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ LOCAL_MODULE := libskia-prebuild
2929
LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libskia.so
3030
include $(PREBUILT_SHARED_LIBRARY)
3131

32+
include $(CLEAR_VARS)
33+
LOCAL_MODULE := libHifiPCM-prebuild
34+
LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libHifiPCM.a
35+
include $(PREBUILT_STATIC_LIBRARY)
36+
37+
3238
include $(CLEAR_VARS)
3339
LOCAL_ARM_MODE := arm
3440

@@ -73,6 +79,7 @@ LOCAL_SRC_FILES += OggID3.cpp
7379
LOCAL_SRC_FILES += AudioId3.cpp
7480
LOCAL_SRC_FILES += base64.cpp
7581
LOCAL_SRC_FILES += Uvcontert.cpp
82+
LOCAL_SRC_FILES += USBHiFi.cpp
7683

7784
LOCAL_CPPFLAGS:=\
7885
-I $(MY_ANDROID_SOURCE)/frameworks/base/core/jni/android/graphics\
@@ -92,6 +99,20 @@ LOCAL_LDLIBS := -llog -lcutils -licuuc -licui18n -lutils -lsqlite -L/home/liuwe
9299

93100

94101
LOCAL_STATIC_LIBRARIES := Mango
102+
LOCAL_STATIC_LIBRARIES += libHifiPCM-prebuild
103+
104+
105+
include $(BUILD_EXECUTABLE)
106+
107+
include $(CLEAR_VARS)
108+
109+
LOCAL_ARM_MODE := arm
110+
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include
111+
LOCAL_SRC_FILES := audiousb.cpp
112+
LOCAL_LDLIBS := -llog -lcutils -licuuc -licui18n -lutils -lsqlite -L/home/liuwenlong/backup/lib
113+
LOCAL_STATIC_LIBRARIES := Mango
114+
LOCAL_STATIC_LIBRARIES += libHifiPCM-prebuild
95115

116+
LOCAL_MODULE := usbhifi
96117

97118
include $(BUILD_EXECUTABLE)

apps/player/ChosenView.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,12 @@ namespace mango
104104
break;
105105
case CHOSEN_RESCAN:
106106
titleres = STR_RESCAN_LIBRARY;
107-
noticeres = STR_FILE_DELETE_MESSAGE;
108-
break;
107+
noticeres = STR_RESCAN_LIBRARY_MESSAGE;
108+
break;
109109
}
110110
mBrightnessValue->setTextResoure(noticeres);
111111
mTitle->setTextResoure(titleres);
112112
gPowerManager->setPowerState(POWER_STATE_ON);
113-
log_i("set power state POWER_STATE_ON");
114113
}
115114

116115
unsigned int ChosenView::PoweroffRunnig(void *parameter){

apps/player/DisplaySettingView.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ namespace mango
129129
gPlayer.showSettingsView();
130130
}else if(fromView == mHome && NM_CLICK){
131131
gPlayer.showPlayingView();
132+
}else if(fromView == mDisplayIcon){
133+
system("setprop persist.sys.usb.config adb");
132134
}
133135

134136
return 0;

0 commit comments

Comments
 (0)