Mercurial > mplayer.hg
comparison mplayer.c @ 7329:9129781e5939
removed messy global 'tv_handle', use stream->priv for that purpose
note: i couldn't test it (only compile test) may be broken :(
we're going to an unified demuxer API - required for modularization
author | arpi |
---|---|
date | Sun, 08 Sep 2002 23:00:01 +0000 |
parents | cd12b5ad8f66 |
children | a2555f227a3d |
comparison
equal
deleted
inserted
replaced
7328:418c29a6d916 | 7329:9129781e5939 |
---|---|
80 | 80 |
81 #ifdef USE_TV | 81 #ifdef USE_TV |
82 #include "libmpdemux/tv.h" | 82 #include "libmpdemux/tv.h" |
83 | 83 |
84 extern int tv_param_on; | 84 extern int tv_param_on; |
85 extern tvi_handle_t *tv_handler; | 85 //extern tvi_handle_t *tv_handler; |
86 #endif | 86 #endif |
87 | 87 |
88 //**************************************************************************// | 88 //**************************************************************************// |
89 // Playtree | 89 // Playtree |
90 //**************************************************************************// | 90 //**************************************************************************// |
2218 #ifdef USE_TV | 2218 #ifdef USE_TV |
2219 case MP_CMD_TV_STEP_CHANNEL : { | 2219 case MP_CMD_TV_STEP_CHANNEL : { |
2220 if (tv_param_on == 1) { | 2220 if (tv_param_on == 1) { |
2221 int v = cmd->args[0].v.i; | 2221 int v = cmd->args[0].v.i; |
2222 if(v > 0) | 2222 if(v > 0) |
2223 tv_step_channel(tv_handler, TV_CHANNEL_HIGHER); | 2223 tv_step_channel((tvi_handle_t*)(stream->priv), TV_CHANNEL_HIGHER); |
2224 else | 2224 else |
2225 tv_step_channel(tv_handler, TV_CHANNEL_LOWER); | 2225 tv_step_channel((tvi_handle_t*)(stream->priv), TV_CHANNEL_LOWER); |
2226 } | 2226 } |
2227 } break; | 2227 } break; |
2228 case MP_CMD_TV_STEP_NORM : { | 2228 case MP_CMD_TV_STEP_NORM : { |
2229 if (tv_param_on == 1) | 2229 if (tv_param_on == 1) |
2230 tv_step_norm(tv_handler); | 2230 tv_step_norm((tvi_handle_t*)(stream->priv)); |
2231 } break; | 2231 } break; |
2232 case MP_CMD_TV_STEP_CHANNEL_LIST : { | 2232 case MP_CMD_TV_STEP_CHANNEL_LIST : { |
2233 if (tv_param_on == 1) | 2233 if (tv_param_on == 1) |
2234 tv_step_chanlist(tv_handler); | 2234 tv_step_chanlist((tvi_handle_t*)(stream->priv)); |
2235 } break; | 2235 } break; |
2236 #endif | 2236 #endif |
2237 case MP_CMD_VO_FULLSCREEN: | 2237 case MP_CMD_VO_FULLSCREEN: |
2238 { | 2238 { |
2239 #ifdef HAVE_NEW_GUI | 2239 #ifdef HAVE_NEW_GUI |