emotion: implement SPU switch for generic/vlc.

Patch by Hugo Camboulive <hugo.camboulive@zodiacaerospace.com>.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/emotion@71831 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/AUTHORS b/AUTHORS
index 95af23a..c683782 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,3 +5,5 @@ Sebastian Dransfeld <sd@tango.flipp.net>
 Cedric Bail <cedric.bail@free.fr>
 Rafael Antognolli <antognolli@profusion.mobi>
 Jérôme Pinot <ngc891@gmail.com>
+Pierre Le Magourou <pierre.lemagourou@openwide.fr>
+Hugo Camboulive <hugo.camboulive@zodiacaerospace.com>

diff --git a/ChangeLog b/ChangeLog
index 203332a..ca8f7af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,3 +17,7 @@
 2012-06-08  Pierre Le Magourou
 
        * Add support for "playback_started" callback to generic player.
+
+2012-06-08  Hugo Camboulive
+
+       * Implement SPU switch for generic/vlc.

diff --git a/NEWS b/NEWS
index 75d4ae0..9f7f54a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Changes since Emotion 1.0.0:
 
 Additions:
        - Add support for "playback_started" callback to generic player.
+       - Implement SPU switch for generic/vlc.
 
 Fixes:
        - build out of tree.

diff --git a/src/generic_players/vlc/emotion_generic_vlc.c b/src/generic_players/vlc/emotion_generic_vlc.c
index 4fe1d16..7ec0a6f 100644 (file)
--- a/src/generic_players/vlc/emotion_generic_vlc.c
+++ b/src/generic_players/vlc/emotion_generic_vlc.c
@@ -474,6 +474,16 @@ _volume_set(struct _App *app)
 }
 
 static void
+_spu_track_set(struct _App *app)
+{
+   int track;
+
+   _em_read_safe(app->em_read, &track, sizeof(track));
+
+   libvlc_video_set_spu(app->mp, track);
+}
+
+static void
 _audio_track_set(struct _App *app)
 {
    int track;
@@ -596,6 +606,9 @@ _process_emotion_commands(struct _App *app)
       case EM_CMD_VOLUME_SET:
         _volume_set(app);
         break;
+      case EM_CMD_SPU_TRACK_SET:
+        _spu_track_set(app);
+        break;
       case EM_CMD_AUDIO_TRACK_SET:
         _audio_track_set(app);
         break;