Skip to content

Commit cd6782c

Browse files
committed
1.解决开gapless播放带CUE的歌曲时,总是从0秒开始播放
2.DX50同轴插入后关CODEC电源 3.关机前唤醒屏幕 4.暂停后MUTE
1 parent 8e18238 commit cd6782c

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

apps/player/playingView.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -619,13 +619,14 @@ namespace mango
619619
if(gPlayer.mCodecType == 0){
620620
isSpdifIn = gPlayer.isSpdifIn();
621621
mPlayinglist->setSpdifOut(isSpdifIn);
622-
}else if(gPlayer.mCodecType == 1){
623-
isSpdifIn = gPlayer.isSpdifIn();
624-
if(isSpdifIn)
625-
system("echo '0'>/sys/class/codec/power");
626-
else
627-
system("echo '1'>/sys/class/codec/power");
628622
}
623+
624+
isSpdifIn = gPlayer.isSpdifIn();
625+
if(isSpdifIn)
626+
system("echo '0'>/sys/class/codec/power");
627+
else
628+
system("echo '1'>/sys/class/codec/power");
629+
629630
gPlayer.mSpdifSwitch->resetSwicth();
630631
}
631632
if(gPlayer.mHeadestSwitch->isToSwicth()){
@@ -717,6 +718,7 @@ namespace mango
717718
log_i("isNeedFresh = %d",isNeedFresh);
718719
}else if(code == NM_POWER_OFF){
719720
log_i("----------NM_POWER_OFF");
721+
gPowerManager->setPowerState(0);
720722
gPlayer.showShutDownView();
721723
mShutdowmThread.create(PlayingView::shutdownRunnig, this);
722724
}else if(code == SDCARD_FILE_CHECK){

apps/player/playinglist.cpp

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,10 @@ void Playinglist::startSlient(){
278278
if(inPause!=state){
279279
inPause = state;
280280
if(state){
281-
if(gPlayer.mCodecType == 1)
282281
gPlayer.openWm8740Mute();
283282
}else{
284-
if(gPlayer.mCodecType == 1){
285283
Thread::sleep(200);
286284
gPlayer.closeWm8740Mute();
287-
}
288285
}
289286
}
290287
}
@@ -554,10 +551,21 @@ void Playinglist::startSlient(){
554551
}
555552

556553
if(needGapless&&mGapless>0&&mParticleplayer->setNextSongForGapless(playPath)){
557-
558-
if(mParticleplayer->gaplessPlay(playPath)){log_i("gaplessPlay() success!");}
559-
else{log_i("gaplessPlay() fail!");stopPlayer();return -1;}
560-
554+
555+
if(mParticleplayer->gaplessPlay(playPath)){
556+
log_i("gaplessPlay() success!");
557+
}else{
558+
log_i("gaplessPlay() fail!");
559+
stopPlayer();
560+
return -1;
561+
}
562+
563+
if(getPlayingItem()->isCue && getPlayingItem()->cueStart>1000){
564+
mParticleplayer->seekTo(getPlayingItem()->cueStart);
565+
}else{
566+
567+
}
568+
561569
}else{
562570
gPlayer.openWm8740Mute();
563571
log_i("start stop() success!");

0 commit comments

Comments
 (0)