Browse Source

update:兼容多媒体的API

alienwalker 3 years ago
parent
commit
ae7bfe17ad
2 changed files with 15 additions and 4 deletions
  1. 12 2
      application/src/luat_audio_air105.c
  2. 3 2
      bsp/audio/include/audio_ll_drv.h

+ 12 - 2
application/src/luat_audio_air105.c

@@ -285,6 +285,7 @@ int luat_audio_pause_raw(uint8_t multimedia_id, uint8_t is_pause)
 int luat_audio_play_stop(uint8_t multimedia_id)
 {
 	prvAudioStream.IsStop = 1;
+	prvAudioStream.LastError = -1;
 }
 
 uint8_t luat_audio_is_finish(uint8_t multimedia_id)
@@ -318,7 +319,6 @@ int luat_audio_play_file(uint8_t multimedia_id, const char *path)
     size_t len;
 	mp3dec_frame_info_t info;
 	FILE *fd = luat_fs_fopen(path, "r");
-
 	if (!fd)
 	{
 		return -1;
@@ -410,7 +410,7 @@ int luat_audio_play_file(uint8_t multimedia_id, const char *path)
 			prvAudioStream.pParam = multimedia_id;
 			prvAudioStream.IsFileNotEnd = 1;
 			prvAudioStream.Decoder(&prvAudioStream, prvAudioStream.CoderParam);
-
+			prvAudioStream.LastError = 0;
 			if (!llist_num(&prvAudioStream.DataHead))
 			{
 				prvAudioStream.fd = NULL;
@@ -462,3 +462,13 @@ void luat_audio_config_dac(uint8_t multimedia_id, int pin, int level)
 {
 
 }
+
+uint16_t luat_audio_vol(uint8_t multimedia_id, uint16_t vol)
+{
+	return 100;
+}
+
+int luat_audio_play_get_last_error(uint8_t multimedia_id)
+{
+	return prvAudioStream.LastError;
+}

+ 3 - 2
bsp/audio/include/audio_ll_drv.h

@@ -35,10 +35,11 @@ typedef struct
 	uint32_t waitRequire;
 	uint32_t DummyAudioTime;
 	uint32_t PADelayTime;
-	uint8_t BitDepth;
-	uint8_t ChannelCount;	//声道,目前只有1或者2
+	int LastError;
 	auStreamFormat_t Format;
 	auStreamBusType_t BusType;	//音频总线类型,DAC, IIS之类的
+	uint8_t BitDepth;
+	uint8_t ChannelCount;	//声道,目前只有1或者2
 	uint8_t BusID;		//音频总线ID
 	uint8_t IsDataSigned;	//数据是否是有符号的
 	uint8_t IsHardwareRun;