summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/lib/emotion_smart.c
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-12-30 11:46:29 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-12-30 11:46:29 +0000
commit1fb8ee18d98e68a48a9488429a76a7b0a21699f7 (patch)
tree02afc180be029204faa85df0d9688c0bebfbef88 /legacy/emotion/src/lib/emotion_smart.c
parentf981adaaaca5100fe082c406d26a0da008a27e4d (diff)
Emotion:fix compilation on Windows
Note1: disable generic plugin on Windows as shm_open like function note implemented on that platform yet. Note2: want_module stuff must be fixed in the m4 macro Note3: abstract semaphore code in Eina ? SVN revision: 66686
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c27
1 files changed, 20 insertions, 7 deletions
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index 8a7ba22344..de31af8c17 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -1,11 +1,24 @@
1#include "emotion_private.h" 1#ifdef HAVE_CONFIG_H
2#include "Emotion.h" 2# include "config.h"
3#endif
4
5#include <Evas.h>
6#include <Ecore.h>
3 7
4#ifdef HAVE_EIO 8#ifdef HAVE_EIO
5# include <math.h> 9# include <math.h>
6# include <Eio.h> 10# include <Eio.h>
7#endif 11#endif
8 12
13#include "Emotion.h"
14#include "emotion_private.h"
15
16#ifdef _WIN32
17# define FMT_UCHAR "%c"
18#else
19# define FMT_UCHAR "%hhu"
20#endif
21
9#define E_SMART_OBJ_GET(smart, o, type) \ 22#define E_SMART_OBJ_GET(smart, o, type) \
10 { \ 23 { \
11 char *_e_smart_str; \ 24 char *_e_smart_str; \
@@ -515,7 +528,7 @@ _emotion_object_aspect_border_apply(Evas_Object *obj, Smart_Data *sd, int w, int
515 double ir; 528 double ir;
516 double r; 529 double r;
517 530
518 int aspect_opt; 531 int aspect_opt = 0;
519 532
520 iw = sd->video.w; 533 iw = sd->video.w;
521 ih = sd->video.h; 534 ih = sd->video.h;
@@ -681,7 +694,7 @@ emotion_object_play_set(Evas_Object *obj, Eina_Bool play)
681 Smart_Data *sd; 694 Smart_Data *sd;
682 695
683 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); 696 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
684 DBG("play=%hhu, was=%hhu", play, sd->play); 697 DBG("play=" FMT_UCHAR ", was=" FMT_UCHAR, play, sd->play);
685 if (play == sd->play) return; 698 if (play == sd->play) return;
686 if (!sd->module) return; 699 if (!sd->module) return;
687 if (!sd->video_data) return; 700 if (!sd->video_data) return;
@@ -872,7 +885,7 @@ emotion_object_audio_mute_set(Evas_Object *obj, Eina_Bool mute)
872 Smart_Data *sd; 885 Smart_Data *sd;
873 886
874 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); 887 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
875 DBG("mute=%hhu", mute); 888 DBG("mute=" FMT_UCHAR, mute);
876 if (!sd->module) return; 889 if (!sd->module) return;
877 if (!sd->video_data) return; 890 if (!sd->video_data) return;
878 sd->module->audio_channel_mute_set(sd->video_data, mute); 891 sd->module->audio_channel_mute_set(sd->video_data, mute);
@@ -940,7 +953,7 @@ emotion_object_video_mute_set(Evas_Object *obj, Eina_Bool mute)
940 Smart_Data *sd; 953 Smart_Data *sd;
941 954
942 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); 955 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
943 DBG("mute=%hhu", mute); 956 DBG("mute=" FMT_UCHAR, mute);
944 if (!sd->module) return; 957 if (!sd->module) return;
945 if (!sd->video_data) return; 958 if (!sd->video_data) return;
946 sd->module->video_channel_mute_set(sd->video_data, mute); 959 sd->module->video_channel_mute_set(sd->video_data, mute);
@@ -1008,7 +1021,7 @@ emotion_object_spu_mute_set(Evas_Object *obj, Eina_Bool mute)
1008 Smart_Data *sd; 1021 Smart_Data *sd;
1009 1022
1010 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); 1023 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
1011 DBG("mute=%hhu", mute); 1024 DBG("mute=" FMT_UCHAR, mute);
1012 if (!sd->module) return; 1025 if (!sd->module) return;
1013 if (!sd->video_data) return; 1026 if (!sd->video_data) return;
1014 sd->module->spu_channel_mute_set(sd->video_data, mute); 1027 sd->module->spu_channel_mute_set(sd->video_data, mute);