summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordavemds <dave@gurumeditation.it>2014-02-20 22:57:32 +0100
committerdavemds <dave@gurumeditation.it>2014-02-20 23:01:06 +0100
commit902307ccaf938ed016333a1050d4ceae80186a00 (patch)
treebffe0e8cdf8b6a22f4152d81b7745eca3550d58f /src
parent451f5d9e59b4b1ebedd3a377b0e7f7314bbf3c69 (diff)
Emotion Generic: receiving the size on opening is correct.
Also: more comments to simplify command debugging.
Diffstat (limited to 'src')
-rw-r--r--src/modules/emotion/generic/Emotion_Generic_Plugin.h32
-rw-r--r--src/modules/emotion/generic/emotion_generic.c3
2 files changed, 16 insertions, 19 deletions
diff --git a/src/modules/emotion/generic/Emotion_Generic_Plugin.h b/src/modules/emotion/generic/Emotion_Generic_Plugin.h
index 6208731061..96b69f6421 100644
--- a/src/modules/emotion/generic/Emotion_Generic_Plugin.h
+++ b/src/modules/emotion/generic/Emotion_Generic_Plugin.h
@@ -20,22 +20,22 @@ typedef struct _Emotion_Generic_Video_Shared Emotion_Generic_Video_Shared;
20 20
21enum _Emotion_Generic_Cmd 21enum _Emotion_Generic_Cmd
22{ 22{
23 EM_CMD_INIT = 0, // param: shared memory identifier (string) 23 EM_CMD_INIT = 0, // 0 param: shared memory identifier (string)
24 EM_CMD_PLAY, // param: position (float) 24 EM_CMD_PLAY, // 1 param: position (float)
25 EM_CMD_STOP, // param: none 25 EM_CMD_STOP, // 2 param: none
26 EM_CMD_FILE_SET, // param: filename (string) 26 EM_CMD_FILE_SET, // 3 param: filename (string)
27 EM_CMD_FILE_SET_DONE, // param: none 27 EM_CMD_FILE_SET_DONE, // 4 param: none
28 EM_CMD_FILE_CLOSE, // param: none 28 EM_CMD_FILE_CLOSE, // 5 param: none
29 EM_CMD_POSITION_SET, // param: position (float) 29 EM_CMD_POSITION_SET, // 6 param: position (float)
30 EM_CMD_SPEED_SET, // param: speed (float) 30 EM_CMD_SPEED_SET, // 7 param: speed (float)
31 EM_CMD_AUDIO_MUTE_SET, // param: muted (int) 31 EM_CMD_AUDIO_MUTE_SET, // 8 param: muted (int)
32 EM_CMD_VIDEO_MUTE_SET, // param: muted (int) 32 EM_CMD_VIDEO_MUTE_SET, // 9 param: muted (int)
33 EM_CMD_SPU_MUTE_SET, // param: muted (int) 33 EM_CMD_SPU_MUTE_SET, // 10 param: muted (int)
34 EM_CMD_VOLUME_SET, // param: volume (float) 34 EM_CMD_VOLUME_SET, // 11 param: volume (float)
35 EM_CMD_AUDIO_TRACK_SET, // param: track id (int) 35 EM_CMD_AUDIO_TRACK_SET, // 12 param: track id (int)
36 EM_CMD_VIDEO_TRACK_SET, // param: track id (int) 36 EM_CMD_VIDEO_TRACK_SET, // 13 param: track id (int)
37 EM_CMD_SPU_TRACK_SET, // param: track id (int) 37 EM_CMD_SPU_TRACK_SET, // 14 param: track id (int)
38 EM_CMD_SUBTITLE_SET, // param: subtitle filename (string) 38 EM_CMD_SUBTITLE_SET, // 15 param: subtitle filename (string)
39 EM_CMD_LAST 39 EM_CMD_LAST
40}; 40};
41 41
diff --git a/src/modules/emotion/generic/emotion_generic.c b/src/modules/emotion/generic/emotion_generic.c
index 086af138e6..c52f087758 100644
--- a/src/modules/emotion/generic/emotion_generic.c
+++ b/src/modules/emotion/generic/emotion_generic.c
@@ -280,9 +280,6 @@ _player_frame_resize(Emotion_Generic_Video *ev)
280 ev->h = h; 280 ev->h = h;
281 ev->ratio = (float)w / h; 281 ev->ratio = (float)w / h;
282 282
283 if (ev->opening)
284 return;
285
286 _emotion_frame_resize(ev->obj, ev->w, ev->h, ev->ratio); 283 _emotion_frame_resize(ev->obj, ev->w, ev->h, ev->ratio);
287} 284}
288 285