changeset 33774:474ffcdcc6e7

Change guiInterface_t void pointer member declarations. Declare the members with their appropriate types. Additionally, remove needless cast then and remove unnecessary #ifdef CONFIG_DVDREAD.

--- a/gui/interface.c	Sun Jul 10 11:21:40 2011 +0000
+++ b/gui/interface.c	Sun Jul 10 11:51:25 2011 +0000
@@ -45,7 +45,6 @@
 #include "libvo/video_out.h"
 #include "libvo/x11_common.h"
 #include "mixer.h"
-#include "mp_core.h"
 #include "mp_msg.h"
 #include "mpcommon.h"
 #include "mplayer.h"

--- a/gui/interface.h	Sun Jul 10 11:21:40 2011 +0000
+++ b/gui/interface.h	Sun Jul 10 11:51:25 2011 +0000
@@ -20,7 +20,10 @@
 #define MPLAYER_GUI_INTERFACE_H
 
 #include "config.h"
+#include "libaf/af.h"
+#include "libmpdemux/stheader.h"
 #include "m_config.h"
+#include "mp_core.h"
 #include "playtree.h"
 #include "stream/stream.h"
 
@@ -76,7 +79,6 @@
     MPLAYER_SET_SUB_ENCODING
 };
 
-#ifdef CONFIG_DVDREAD
 typedef struct {
     int titles;
     int chapters;
@@ -89,12 +91,11 @@
     int nr_of_subtitles;
     stream_language_t subtitles[32];
 } guiDVDStruct;
-#endif
 
 typedef struct {
-    struct MPContext *mpcontext;
-    void *sh_video;
-    void *afilter;
+    MPContext *mpcontext;
+    sh_video_t *sh_video;
+    af_stream_t *afilter;
 
     int DiskChanged;
     int NewPlay;

--- a/gui/ui/render.c	Sun Jul 10 11:21:40 2011 +0000
+++ b/gui/ui/render.c	Sun Jul 10 11:51:25 2011 +0000
@@ -220,7 +220,7 @@
                 break;
 
             case 'C':
-                snprintf(tmp, sizeof(tmp), "%s", guiInfo.sh_video ? ((sh_video_t *)guiInfo.sh_video)->codec->name : "");
+                snprintf(tmp, sizeof(tmp), "%s", guiInfo.sh_video ? guiInfo.sh_video->codec->name : "");
                 av_strlcat(trbuf, tmp, sizeof(trbuf));
                 break;