RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-04 23:40:47 +00:00
Code Issues Releases Wiki Activity

Gui compilation fixes

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22326 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
vayne 2007-02-23 18:48:43 +00:00
parent 09d15d04c2
commit f8a7312dfb
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gui/win32/gui.c
View File

@ -61,6 +61,8 @@ float sub_aspect;
DWORD oldtime; DWORD oldtime;
NOTIFYICONDATA nid; NOTIFYICONDATA nid;
int console_state = 0; int console_state = 0;
play_tree_t *playtree = NULL;
m_config_t* mconfig = NULL;
static HBRUSH colorbrush = NULL; //Handle to colorkey brush static HBRUSH colorbrush = NULL; //Handle to colorkey brush
static COLORREF windowcolor = RGB(255,0,255); //Windowcolor == colorkey static COLORREF windowcolor = RGB(255,0,255); //Windowcolor == colorkey

27
Gui/win32/interface.c
View File

@ -35,6 +35,7 @@
#include <input/input.h> #include <input/input.h>
#include <libvo/video_out.h> #include <libvo/video_out.h>
#include <libao2/audio_out.h> #include <libao2/audio_out.h>
#include <access_mpcontext.h>
#include "gui.h" #include "gui.h"
#include "dialogs.h" #include "dialogs.h"
#include "wincfg.h" #include "wincfg.h"
@ -43,13 +44,10 @@
#endif #endif
extern m_obj_settings_t *vf_settings; extern m_obj_settings_t *vf_settings;
extern vo_functions_t *video_out;
extern ao_functions_t *audio_out;
extern void exit_player(const char *how); extern void exit_player(const char *how);
extern char *filename; extern char *filename;
extern int abs_seek_pos; extern int abs_seek_pos;
extern float rel_seek_secs; extern float rel_seek_secs;
extern mixer_t mixer;
extern int audio_id; extern int audio_id;
extern int video_id; extern int video_id;
extern int dvdsub_id; extern int dvdsub_id;
@ -69,6 +67,9 @@ static gui_t *mygui = NULL;
static int update_subwindow(void); static int update_subwindow(void);
static RECT old_rect; static RECT old_rect;
static DWORD style; static DWORD style;
ao_functions_t *audio_out = NULL;
vo_functions_t *video_out = NULL;
mixer_t *mixer = NULL;
/* test for playlist files, no need to specify -playlist on the commandline. /* test for playlist files, no need to specify -playlist on the commandline.
* add any conceivable playlist extensions here. * add any conceivable playlist extensions here.
@ -144,6 +145,9 @@ void greplace(char ***list, char *search, char *replace)
/* this function gets called by the gui to update mplayer */ /* this function gets called by the gui to update mplayer */
static void guiSetEvent(int event) static void guiSetEvent(int event)
{ {
if(guiIntfStruct.mpcontext)
mixer = mpctx_get_mixer(guiIntfStruct.mpcontext);
switch(event) switch(event)
{ {
case evPlay: case evPlay:
@ -245,22 +249,22 @@ static void guiSetEvent(int event)
break; break;
if (guiIntfStruct.Balance == 50.0f) if (guiIntfStruct.Balance == 50.0f)
mixer_setvolume(&mixer, guiIntfStruct.Volume, guiIntfStruct.Volume); mixer_setvolume(mixer, guiIntfStruct.Volume, guiIntfStruct.Volume);
l = guiIntfStruct.Volume * ((100.0f - guiIntfStruct.Balance) / 50.0f); l = guiIntfStruct.Volume * ((100.0f - guiIntfStruct.Balance) / 50.0f);
r = guiIntfStruct.Volume * ((guiIntfStruct.Balance) / 50.0f); r = guiIntfStruct.Volume * ((guiIntfStruct.Balance) / 50.0f);
if (l > guiIntfStruct.Volume) l=guiIntfStruct.Volume; if (l > guiIntfStruct.Volume) l=guiIntfStruct.Volume;
if (r > guiIntfStruct.Volume) r=guiIntfStruct.Volume; if (r > guiIntfStruct.Volume) r=guiIntfStruct.Volume;
mixer_setvolume(&mixer, l, r); mixer_setvolume(mixer, l, r);
/* Check for balance support on mixer - there is a better way ?? */ /* Check for balance support on mixer - there is a better way ?? */
if (r != l) if (r != l)
{ {
mixer_getvolume(&mixer, &l, &r); mixer_getvolume(mixer, &l, &r);
if (r == l) if (r == l)
{ {
mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] Mixer doesn't support balanced audio\n"); mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] Mixer doesn't support balanced audio\n");
mixer_setvolume(&mixer, guiIntfStruct.Volume, guiIntfStruct.Volume); mixer_setvolume(mixer, guiIntfStruct.Volume, guiIntfStruct.Volume);
guiIntfStruct.Balance = 50.0f; guiIntfStruct.Balance = 50.0f;
} }
} }
@ -490,6 +494,13 @@ int guiGetEvent(int type, char *arg)
#endif #endif
if(!mygui || !mygui->skin) return 0; if(!mygui || !mygui->skin) return 0;
if(guiIntfStruct.mpcontext)
{
audio_out = mpctx_get_audio_out(guiIntfStruct.mpcontext);
video_out = mpctx_get_video_out(guiIntfStruct.mpcontext);
mixer = mpctx_get_mixer(guiIntfStruct.mpcontext);
}
switch (type) switch (type)
{ {
case guiSetFileFormat: case guiSetFileFormat:
@ -730,7 +741,7 @@ int guiGetEvent(int type, char *arg)
/* Some audio_out drivers do not support balance e.g. dsound */ /* Some audio_out drivers do not support balance e.g. dsound */
/* FIXME this algo is not correct */ /* FIXME this algo is not correct */
float l, r; float l, r;
mixer_getvolume(&mixer, &l, &r); mixer_getvolume(mixer, &l, &r);
guiIntfStruct.Volume = (r > l ? r : l); /* max(r,l) */ guiIntfStruct.Volume = (r > l ? r : l); /* max(r,l) */
if (r != l) if (r != l)
guiIntfStruct.Balance = ((r-l) + 100.0f) * 0.5f; guiIntfStruct.Balance = ((r-l) + 100.0f) * 0.5f;