summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-07 12:42:40 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-07 12:42:40 +0000
commit51880f90296668609dd999b7818632760701f357 (patch)
tree700e2296475b9c38a9e0ea8cef1035ec06886858 /stream
parentc655b2d499728a4871b4f68c4d0245fce322bdb5 (diff)
downloadmpv-51880f90296668609dd999b7818632760701f357.tar.bz2
mpv-51880f90296668609dd999b7818632760701f357.tar.xz
rename for consistency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27017 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_dvdnav.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 6734a388ea..e6d2ef2266 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -25,7 +25,7 @@ typedef enum {
NAV_FLAG_EOF = 1 << 0, /* end of stream has been reached */
NAV_FLAG_WAIT = 1 << 1, /* wait event */
NAV_FLAG_WAIT_SKIP = 1 << 2, /* wait skip disable */
- NAV_FLAG_CELL_CHANGED = 1 << 3, /* cell change event */
+ NAV_FLAG_CELL_CHANGE = 1 << 3, /* cell change event */
NAV_FLAG_WAIT_READ_AUTO = 1 << 4, /* wait read auto mode */
NAV_FLAG_WAIT_READ = 1 << 5, /* suspend read from stream */
NAV_FLAG_VTS_DOMAIN = 1 << 6, /* vts domain */
@@ -333,7 +333,7 @@ static int fill_buffer(stream_t *s, char *but, int len)
int tit = 0, part = 0;
dvdnav_vts_change_event_t *vts_event = (dvdnav_vts_change_event_t *)s->buffer;
mp_msg(MSGT_CPLAYER,MSGL_INFO, "DVDNAV, switched to title: %d\r\n", vts_event->new_vtsN);
- priv->state |= NAV_FLAG_CELL_CHANGED;
+ priv->state |= NAV_FLAG_CELL_CHANGE;
priv->state |= NAV_FLAG_AUDIO_CHANGE;
priv->state |= NAV_FLAG_SPU_CHANGE;
priv->state &= ~NAV_FLAG_WAIT_SKIP;
@@ -351,7 +351,7 @@ static int fill_buffer(stream_t *s, char *but, int len)
break;
}
case DVDNAV_CELL_CHANGE: {
- priv->state |= NAV_FLAG_CELL_CHANGED;
+ priv->state |= NAV_FLAG_CELL_CHANGE;
priv->state |= NAV_FLAG_AUDIO_CHANGE;
priv->state |= NAV_FLAG_SPU_CHANGE;
priv->state &= ~NAV_FLAG_WAIT_SKIP;
@@ -909,10 +909,10 @@ void mp_dvdnav_read_wait (stream_t *stream, int mode, int automode) {
*/
int mp_dvdnav_cell_has_changed (stream_t *stream, int clear) {
dvdnav_priv_t *priv = stream->priv;
- if (!(priv->state & NAV_FLAG_CELL_CHANGED))
+ if (!(priv->state & NAV_FLAG_CELL_CHANGE))
return 0;
if (clear) {
- priv->state &= ~NAV_FLAG_CELL_CHANGED;
+ priv->state &= ~NAV_FLAG_CELL_CHANGE;
priv->state |= NAV_FLAG_STREAM_CHANGE;
}
return 1;