Commit 2e42f024 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

input: remove write-only INPUT_UPDATE_SIZE

parent 732c5ed4
...@@ -203,7 +203,6 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a ) ...@@ -203,7 +203,6 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a )
*****************************************************************************/ *****************************************************************************/
/* i_update field of access_t/demux_t */ /* i_update field of access_t/demux_t */
#define INPUT_UPDATE_SIZE 0x0001
#define INPUT_UPDATE_TITLE 0x0010 #define INPUT_UPDATE_TITLE 0x0010
#define INPUT_UPDATE_SEEKPOINT 0x0020 #define INPUT_UPDATE_SEEKPOINT 0x0020
#define INPUT_UPDATE_META 0x0040 #define INPUT_UPDATE_META 0x0040
......
...@@ -313,12 +313,8 @@ static ssize_t FileRead (access_t *p_access, uint8_t *p_buffer, size_t i_len) ...@@ -313,12 +313,8 @@ static ssize_t FileRead (access_t *p_access, uint8_t *p_buffer, size_t i_len)
{ {
struct stat st; struct stat st;
if ((fstat (fd, &st) == 0) if (fstat (fd, &st) == 0)
&& (p_access->info.i_size != (uint64_t)st.st_size))
{
p_access->info.i_size = st.st_size; p_access->info.i_size = st.st_size;
p_access->info.i_update |= INPUT_UPDATE_SIZE;
}
} }
return val; return val;
} }
......
...@@ -273,7 +273,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) ...@@ -273,7 +273,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
{ {
/* Update info */ /* Update info */
p_access->info.i_update |= p_access->info.i_update |=
INPUT_UPDATE_TITLE|INPUT_UPDATE_SEEKPOINT|INPUT_UPDATE_SIZE; INPUT_UPDATE_TITLE|INPUT_UPDATE_SEEKPOINT;
p_access->info.i_title = i; p_access->info.i_title = i;
p_access->info.i_seekpoint = 0; p_access->info.i_seekpoint = 0;
p_access->info.i_size = p_sys->title[i]->i_size; p_access->info.i_size = p_sys->title[i]->i_size;
...@@ -336,7 +336,7 @@ static block_t *Block( access_t *p_access ) ...@@ -336,7 +336,7 @@ static block_t *Block( access_t *p_access )
} }
p_access->info.i_update |= p_access->info.i_update |=
INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT | INPUT_UPDATE_SIZE; INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT;
p_access->info.i_title++; p_access->info.i_title++;
p_access->info.i_seekpoint = 0; p_access->info.i_seekpoint = 0;
p_access->info.i_size = p_sys->title[p_access->info.i_title]->i_size; p_access->info.i_size = p_sys->title[p_access->info.i_title]->i_size;
......
...@@ -715,8 +715,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track, ...@@ -715,8 +715,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
p_vcdplayer->play_item.type ); p_vcdplayer->play_item.type );
} }
p_access->info.i_update = INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE p_access->info.i_update = INPUT_UPDATE_TITLE|INPUT_UPDATE_SEEKPOINT;
|INPUT_UPDATE_SEEKPOINT;
VCDUpdateTitle( p_access ); VCDUpdateTitle( p_access );
......
...@@ -481,7 +481,6 @@ static bool ImportNextFile( access_t *p_access ) ...@@ -481,7 +481,6 @@ static bool ImportNextFile( access_t *p_access )
ARRAY_APPEND( p_sys->file_sizes, st.st_size ); ARRAY_APPEND( p_sys->file_sizes, st.st_size );
p_access->info.i_size += st.st_size; p_access->info.i_size += st.st_size;
p_access->info.i_update |= INPUT_UPDATE_SIZE;
return true; return true;
} }
...@@ -586,7 +585,6 @@ static void UpdateFileSize( access_t *p_access ) ...@@ -586,7 +585,6 @@ static void UpdateFileSize( access_t *p_access )
p_access->info.i_size -= CURRENT_FILE_SIZE; p_access->info.i_size -= CURRENT_FILE_SIZE;
CURRENT_FILE_SIZE = st.st_size; CURRENT_FILE_SIZE = st.st_size;
p_access->info.i_size += CURRENT_FILE_SIZE; p_access->info.i_size += CURRENT_FILE_SIZE;
p_access->info.i_update |= INPUT_UPDATE_SIZE;
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -2208,8 +2208,6 @@ static void UpdateGenericFromDemux( input_thread_t *p_input ) ...@@ -2208,8 +2208,6 @@ static void UpdateGenericFromDemux( input_thread_t *p_input )
} }
p_demux->info.i_update &= ~INPUT_UPDATE_META; p_demux->info.i_update &= ~INPUT_UPDATE_META;
} }
p_demux->info.i_update &= ~INPUT_UPDATE_SIZE;
} }
static void UpdateTitleListfromDemux( input_thread_t *p_input ) static void UpdateTitleListfromDemux( input_thread_t *p_input )
...@@ -2293,8 +2291,6 @@ static void UpdateGenericFromAccess( input_thread_t *p_input ) ...@@ -2293,8 +2291,6 @@ static void UpdateGenericFromAccess( input_thread_t *p_input )
p_access->info.i_update &= ~INPUT_UPDATE_SIGNAL; p_access->info.i_update &= ~INPUT_UPDATE_SIGNAL;
} }
p_access->info.i_update &= ~INPUT_UPDATE_SIZE;
} }
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment