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

Kill further I64C

I think I'm going to become stricter about NOT merging out-of-sync
patches
parent b54b2ddb
...@@ -564,7 +564,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t ...@@ -564,7 +564,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t
p_spu->p_region->psz_text = strdup(ev->text); /* no leak, this actually gets killed by the core */ p_spu->p_region->psz_text = strdup(ev->text); /* no leak, this actually gets killed by the core */
p_spu->i_start = p_block->i_pts; p_spu->i_start = p_block->i_pts;
p_spu->i_stop = p_block->i_pts + I64C(1000000)*ev->duration*p_sys->ki.gps_denominator/p_sys->ki.gps_numerator; p_spu->i_stop = p_block->i_pts + INT64_C(1000000)*ev->duration*p_sys->ki.gps_denominator/p_sys->ki.gps_numerator;
p_spu->b_ephemer = (p_block->i_length == 0); p_spu->b_ephemer = (p_block->i_length == 0);
p_spu->b_absolute = false; p_spu->b_absolute = false;
......
...@@ -204,10 +204,10 @@ void VLMSliderManager::ProcessUpdate( wxScrollEvent &event ) ...@@ -204,10 +204,10 @@ void VLMSliderManager::ProcessUpdate( wxScrollEvent &event )
char psz_time[ MSTRTIME_MAX_SIZE ], psz_total[ MSTRTIME_MAX_SIZE ]; char psz_time[ MSTRTIME_MAX_SIZE ], psz_total[ MSTRTIME_MAX_SIZE ];
mtime_t i_seconds; mtime_t i_seconds;
i_seconds = var_GetTime( p_input, "length" ) / I64C(1000000 ); i_seconds = var_GetTime( p_input, "length" ) / INT64_C( 1000000 );
secstotimestr( psz_total, i_seconds ); secstotimestr( psz_total, i_seconds );
i_seconds = var_GetTime( p_input, "time" ) / I64C(1000000 ); i_seconds = var_GetTime( p_input, "time" ) / INT_64C( 1000000 );
secstotimestr( psz_time, i_seconds ); secstotimestr( psz_time, i_seconds );
time_string = wxU(psz_time) + wxString(wxT(" / ") ) +wxU(psz_total) ; time_string = wxU(psz_time) + wxString(wxT(" / ") ) +wxU(psz_total) ;
......
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