 ssc
|
4e98ce86ee
Merge branch 'dev-x10-1.0' into dev-x30-1.0
|
4 years ago |
|
ssc
|
7e939ed3a5
1.每次播放前先停止一下
|
4 years ago |
|
ssc
|
d50c23af88
Merge branch 'dev-x10-1.0' into dev-x30-1.0
|
4 years ago |
|
ssc
|
dba5b50fa8
1.修改硬件音量等于0的问题
|
4 years ago |
|
ssc
|
2cc5b10883
1.修改merge遗漏
|
4 years ago |
|
ssc
|
ba437f6560
Merge branch 'dev-x10-1.0' into dev-x30-1.0
|
4 years ago |
|
ssc
|
e57b764f9d
1.fix
|
4 years ago |
|
ssc
|
b0c4997b66
1.修改硬件音量的读取位置 2.修改写入配置时同步文件
|
4 years ago |
|
ssc
|
8696592b9d
1.修改硬件音量的读取位置 2.修改写入配置时同步文件
|
4 years ago |
|
ssc
|
ac414d21ef
fix reconnect
|
5 years ago |
|
ssc
|
8a00f43453
merge
|
5 years ago |
|
ssc
|
72d9b96d5d
Merge branch 'dev-x10-1.0' into dev-x30-1.0
|
5 years ago |
|
ssc
|
b058089191
fix network reconnect
|
5 years ago |
|
ssc
|
d9f5a7f87d
Merge branch 'dev-x10-1.0' into dev-x30-1.0
|
5 years ago |
|
ssc
|
30cde500fb
fix fifo func
|
5 years ago |
|
ssc
|
cd5f150d30
git revert
|
5 years ago |
|
ssc
|
c2939b2749
add fifo
|
5 years ago |
|
ssc
|
b6308af2bc
merge
|
5 years ago |
|
ssc
|
c9d5cad73c
add comment
|
5 years ago |
|
ssc
|
bd4f10311e
1.修改每次pull rtsp 先停止原来的
|
5 years ago |
|
ssc
|
7a7a1b505d
Merge branch 'dev-x10-1.0' into dev-x30-1.0
|
5 years ago |
|
ssc
|
5e04155947
1.增加rtsp拉取功能
|
5 years ago |
|
ssc
|
acf09d66b6
merge
|
5 years ago |
|
ssc
|
34295eee11
1.把没有修改完的配置修改完成
|
5 years ago |
|
ssc
|
4c31836247
1.修改ispeaker项目需要修改的配置文件不与原系统的配置文件放在同一个配置文件
|
5 years ago |
|
ssc
|
8c339564db
1.修改ispeaker项目需要修改的配置文件不与原系统的配置文件放在同一个配置文件
|
5 years ago |
|
ssc
|
ea92b0e072
merge dev-x10-1.0 and fix conflict
|
5 years ago |
|
ssc
|
298dc0fcd6
1.修改喊话过程中恢复播放BUG 2.修改由于分机状态变化下发恢复播放指令 先判断是否正在播放 如果在播放就不用恢复播放了
|
5 years ago |
|
ssc
|
c00c571e2f
delete pull sdp function
|
5 years ago |
|
ssc
|
18588b3b89
1.增加断电断网恢复播放 2.增加sdp转发
|
5 years ago |
