comparison gui/interface.h @ 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.

33773:a3983d2c9106

#ifndef MPLAYER_GUI_INTERFACE_H
#define MPLAYER_GUI_INTERFACE_H

#include "config.h"
#include "m_config.h"
#include "playtree.h"
#include "stream/stream.h"

// These are in support of the non-GUI files that interact with
// the GUI and that only need to include interface.h for this.

    MPLAYER_SET_PANSCAN,
    MPLAYER_SET_SATURATION,
    MPLAYER_SET_SUB_ENCODING
};

#ifdef CONFIG_DVDREAD
typedef struct {
    int titles;
    int chapters;
    int angles;
    int current_chapter;

    int nr_of_audio_channels;
    stream_language_t audio_streams[32];
    int nr_of_subtitles;
    stream_language_t subtitles[32];
} guiDVDStruct;
#endif

typedef struct {
    struct MPContext *mpcontext;
    void *sh_video;
    void *afilter;

    int DiskChanged;
    int NewPlay;

#ifdef CONFIG_DVDREAD

33774:474ffcdcc6e7

#ifndef MPLAYER_GUI_INTERFACE_H
#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"

// These are in support of the non-GUI files that interact with
// the GUI and that only need to include interface.h for this.

    MPLAYER_SET_PANSCAN,
    MPLAYER_SET_SATURATION,
    MPLAYER_SET_SUB_ENCODING
};

typedef struct {
    int titles;
    int chapters;
    int angles;
    int current_chapter;

    int nr_of_audio_channels;
    stream_language_t audio_streams[32];
    int nr_of_subtitles;
    stream_language_t subtitles[32];
} guiDVDStruct;

typedef struct {
    MPContext *mpcontext;
    sh_video_t *sh_video;
    af_stream_t *afilter;

    int DiskChanged;
    int NewPlay;

#ifdef CONFIG_DVDREAD