summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-06-08 05:10:29 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-06-08 05:10:29 +0000
commit71c85603a71b1382a2eb12cbe9e5e5db9eadcfe1 (patch)
tree8fe753a52cd97dc0eb1cdcd526e8033cd31842bc /legacy/emotion
parent080e163c6f579796ac390da52b12641c50d91ead (diff)
emotion: implement SPU switch for generic/vlc.
Patch by Hugo Camboulive <hugo.camboulive@zodiacaerospace.com>. SVN revision: 71831
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/AUTHORS2
-rw-r--r--legacy/emotion/ChangeLog4
-rw-r--r--legacy/emotion/NEWS1
-rw-r--r--legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c13
4 files changed, 20 insertions, 0 deletions
diff --git a/legacy/emotion/AUTHORS b/legacy/emotion/AUTHORS
index 95af23a32d..c683782f43 100644
--- a/legacy/emotion/AUTHORS
+++ b/legacy/emotion/AUTHORS
@@ -5,3 +5,5 @@ Sebastian Dransfeld <sd@tango.flipp.net>
5Cedric Bail <cedric.bail@free.fr> 5Cedric Bail <cedric.bail@free.fr>
6Rafael Antognolli <antognolli@profusion.mobi> 6Rafael Antognolli <antognolli@profusion.mobi>
7Jérôme Pinot <ngc891@gmail.com> 7Jérôme Pinot <ngc891@gmail.com>
8Pierre Le Magourou <pierre.lemagourou@openwide.fr>
9Hugo Camboulive <hugo.camboulive@zodiacaerospace.com>
diff --git a/legacy/emotion/ChangeLog b/legacy/emotion/ChangeLog
index 203332a275..ca8f7aff55 100644
--- a/legacy/emotion/ChangeLog
+++ b/legacy/emotion/ChangeLog
@@ -17,3 +17,7 @@
172012-06-08 Pierre Le Magourou 172012-06-08 Pierre Le Magourou
18 18
19 * Add support for "playback_started" callback to generic player. 19 * Add support for "playback_started" callback to generic player.
20
212012-06-08 Hugo Camboulive
22
23 * Implement SPU switch for generic/vlc.
diff --git a/legacy/emotion/NEWS b/legacy/emotion/NEWS
index 75d4ae05de..9f7f54ab73 100644
--- a/legacy/emotion/NEWS
+++ b/legacy/emotion/NEWS
@@ -5,6 +5,7 @@ Changes since Emotion 1.0.0:
5 5
6Additions: 6Additions:
7 - Add support for "playback_started" callback to generic player. 7 - Add support for "playback_started" callback to generic player.
8 - Implement SPU switch for generic/vlc.
8 9
9Fixes: 10Fixes:
10 - build out of tree. 11 - build out of tree.
diff --git a/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c b/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
index 4fe1d16fbc..7ec0a6f6c2 100644
--- a/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
+++ b/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
@@ -474,6 +474,16 @@ _volume_set(struct _App *app)
474} 474}
475 475
476static void 476static void
477_spu_track_set(struct _App *app)
478{
479 int track;
480
481 _em_read_safe(app->em_read, &track, sizeof(track));
482
483 libvlc_video_set_spu(app->mp, track);
484}
485
486static void
477_audio_track_set(struct _App *app) 487_audio_track_set(struct _App *app)
478{ 488{
479 int track; 489 int track;
@@ -596,6 +606,9 @@ _process_emotion_commands(struct _App *app)
596 case EM_CMD_VOLUME_SET: 606 case EM_CMD_VOLUME_SET:
597 _volume_set(app); 607 _volume_set(app);
598 break; 608 break;
609 case EM_CMD_SPU_TRACK_SET:
610 _spu_track_set(app);
611 break;
599 case EM_CMD_AUDIO_TRACK_SET: 612 case EM_CMD_AUDIO_TRACK_SET:
600 _audio_track_set(app); 613 _audio_track_set(app);
601 break; 614 break;