mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/movieplayer.cpp: add PID volume adjusting

Browse Source
This commit is contained in:
[CST] Focus
2012-08-16 15:56:17 +04:00
parent b8f78e9c5d
commit e621f644f8
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/movieplayer.cpp
View File

@@ -39,6 +39,7 @@
#include <gui/infoclock.h> #include <gui/infoclock.h>
#include <gui/plugins.h> #include <gui/plugins.h>
#include <driver/screenshot.h> #include <driver/screenshot.h>
#include <driver/volume.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
@@ -422,8 +423,11 @@ void CMoviePlayerGui::PlayFile(void)
printf("IS FILE PLAYER: %s\n", is_file_player ? "true": "false" ); printf("IS FILE PLAYER: %s\n", is_file_player ? "true": "false" );
if(p_movie_info != NULL) if(p_movie_info != NULL) {
duration = p_movie_info->length * 60 * 1000; duration = p_movie_info->length * 60 * 1000;
int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, currentapid, currentac3 == 1);
CZapit::getInstance()->SetVolumePercent(percent);
}
file_prozent = 0; file_prozent = 0;
if(!playback->Start((char *) full_name.c_str(), vpid, vtype, currentapid, currentac3, duration)) { if(!playback->Start((char *) full_name.c_str(), vpid, vtype, currentapid, currentac3, duration)) {
@@ -787,6 +791,21 @@ void CMoviePlayerGui::selectAudioPid(bool file_player)
APIDSelector.addItem(item, defpid); APIDSelector.addItem(item, defpid);
} }
if (p_movie_info) {
APIDSelector.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_AUDIOMENU_VOLUME_ADJUST));
CVolume::getInstance()->SetCurrentChannel(p_movie_info->epgId);
CVolume::getInstance()->SetCurrentPid(currentapid);
int percent[numpida];
for (uint i=0; i < numpida; i++) {
percent[i] = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, apids[i], ac3flags[i]);
APIDSelector.addItem(new CMenuOptionNumberChooser(NONEXISTANT_LOCALE, &percent[i],
currentapid == apids[i],
0, 999, CVolume::getInstance(), 0, 0, NONEXISTANT_LOCALE,
g_RemoteControl->current_PIDs.APIDs[i].desc));
}
}
APIDSelector.exec(NULL, ""); APIDSelector.exec(NULL, "");
delete selector; delete selector;
printf("CMoviePlayerGui::selectAudioPid: selected %d (%x) current %x\n", select, (select >= 0) ? apids[select] : -1, currentapid); printf("CMoviePlayerGui::selectAudioPid: selected %d (%x) current %x\n", select, (select >= 0) ? apids[select] : -1, currentapid);