Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • Thrillseekr/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
400 results
Show changes
Commits on Source (3)
......@@ -190,10 +190,10 @@ struct timespec timespec_from_vlc_tick(vlc_tick_t date);
/*****************************************************************************
* MSTRTIME_MAX_SIZE: maximum possible size of secstotimestr
* MSTRTIME_MAX_SIZE: maximum possible size of vlc_tick_to_str
*****************************************************************************
* This values is the maximal possible size of the string returned by the
* secstotimestr() function, including '-' and the final '\0'. It should be
* vlc_tick_to_str() function, including '-' and the final '\0'. It should be
* used to allocate the buffer.
*****************************************************************************/
#define MSTRTIME_MAX_SIZE 22
......@@ -208,11 +208,11 @@ struct timespec timespec_from_vlc_tick(vlc_tick_t date);
* This function is provided for any interface function which need to print a
* time string in the format h:mm:ss
* date.
* \param secs the date to be converted
* \param ticks the time to be converted
* \param psz_buffer should be a buffer at least MSTRTIME_MAX_SIZE characters
* \return psz_buffer is returned so this can be used as printf parameter.
*/
VLC_API char * secstotimestr( char *psz_buffer, int32_t secs );
VLC_API char * vlc_tick_to_str( char *psz_buffer, vlc_tick_t ticks );
/**
* \defgroup date Timestamps, error-free
......
......@@ -654,7 +654,7 @@ static int Scan_Next_DVBT( const scan_parameter_t *p_params, scan_enumeration_t
const int i_offset_count = 5;
const int i_mhz = 1000000;
/* We will probe the whole band divided in all bandwidth possibility trying
/* We will probe the whole band divided in all bandwidth possibility trying
* i_offset_count offset around the position
*/
for( ;; p_spectrum->i_index++ )
......@@ -815,9 +815,10 @@ static int scan_Next( scan_t *p_scan, scan_tuner_config_t *p_cfg )
const vlc_tick_t i_eta = f_position > 0.005 ? (vlc_tick_now() - p_scan->i_time_start) * ( 1.0 / f_position - 1.0 ) : -1;
char psz_eta[MSTRTIME_MAX_SIZE];
const char *psz_fmt = _("%.1f MHz (%d services)\n~%s remaining");
vlc_tick_to_str( psz_eta, i_eta );
if( i_eta >= 0 )
msg_Info( p_scan->p_obj, "Scan ETA %s | %f", secstotimestr( psz_eta, i_eta/1000000 ), f_position * 100 );
msg_Info( p_scan->p_obj, "Scan ETA %s | %f", psz_eta, f_position * 100 );
if( p_scan->p_dialog_id == NULL )
{
......@@ -827,7 +828,7 @@ static int scan_Next( scan_t *p_scan, scan_tuner_config_t *p_cfg )
_("Scanning DVB"), psz_fmt,
(double)p_cfg->i_frequency / 1000000,
i_total_services,
secstotimestr( psz_eta, i_eta/1000000 ) );
psz_eta);
}
else
{
......@@ -835,7 +836,7 @@ static int scan_Next( scan_t *p_scan, scan_tuner_config_t *p_cfg )
f_position, psz_fmt,
(double)p_cfg->i_frequency / 1000000,
i_total_services,
secstotimestr( psz_eta, i_eta/1000000 ) );
psz_eta );
}
return VLC_SUCCESS;
......
......@@ -154,7 +154,7 @@ static void print_playlist(struct cli_client *cl, vlc_playlist_t *playlist)
if (len != INPUT_DURATION_INDEFINITE && len != VLC_TICK_INVALID)
{
char buf[MSTRTIME_MAX_SIZE];
secstotimestr(buf, SEC_FROM_VLC_TICK(len));
vlc_tick_to_str(buf, len);
cli_printf(cl, "| %c%zu %s (%s)", selected, i, item->psz_name, buf);
}
else
......
......@@ -59,10 +59,10 @@ NSString *const kVLCMediaUnknown = @"Unknown";
vlc_tick_t remaining = (duration > time) ? (duration - time) : 0;
return [NSString stringWithFormat:@"-%s",
secstotimestr(psz_time, (int)SEC_FROM_VLC_TICK(remaining))];
vlc_tick_to_str(psz_time, remaining)];
} else {
return [NSString stringWithUTF8String:
secstotimestr(psz_time, (int)SEC_FROM_VLC_TICK(time))];
vlc_tick_to_str(psz_time, time)];
}
}
......@@ -70,7 +70,7 @@ NSString *const kVLCMediaUnknown = @"Unknown";
{
char psz_time[MSTRTIME_MAX_SIZE];
return [NSString stringWithUTF8String:
secstotimestr(psz_time, (int)SEC_FROM_VLC_TICK(time))];
vlc_tick_to_str(psz_time, time)];
}
+ (instancetype)stringWithTime:(long long int)time
......
......@@ -345,7 +345,7 @@ static NSString *kAssociatedFullscreenRect = @"VLCFullscreenAssociatedWindowRect
/* Update current position (left field) */
char psz_time[MSTRTIME_MAX_SIZE];
NSString *playbackPosition = toNSStr(secstotimestr(psz_time, (int)SEC_FROM_VLC_TICK(time)));
NSString *playbackPosition = toNSStr(vlc_tick_to_str(psz_time, time));
[_elapsedTime setStringValue:playbackPosition];
}
......
......@@ -967,8 +967,8 @@ static int DrawStatus(intf_thread_t *intf)
/* Fall-through */
default:
secstotimestr(buf1, SEC_FROM_VLC_TICK(vlc_player_GetTime(player)));
secstotimestr(buf2, SEC_FROM_VLC_TICK(vlc_player_GetLength(player)));
vlc_tick_to_str(buf1, vlc_player_GetTime(player));
vlc_tick_to_str(buf2, vlc_player_GetLength(player));
mvnprintw(y++, 0, COLS, _(" Position : %s/%s"), buf1, buf2);
......
......@@ -23,7 +23,7 @@ cat libvlccore.sym | grep -v \
-e '^date_' -e '^plane_' \
-e '^us_' -e '^utf8_' -e '^xml_' \
-e '^[A-Z][a-z]*Charset$' \
-e '^NTPtime64$' -e '^secstotimestr$' \
-e '^NTPtime64$' \
&& exit 1
echo "None found."
......@@ -250,6 +250,7 @@ vlc_uri_compose
vlc_uri_resolve
vlc_uri_fixup
vlc_tick_now
vlc_tick_to_str
module_config_free
module_config_get
module_find
......@@ -324,7 +325,6 @@ picture_pool_Wait
picture_Reset
picture_Setup
plane_CopyPixels
secstotimestr
sout_AccessOutControl
sout_AccessOutDelete
sout_AccessOutNew
......
......@@ -38,15 +38,16 @@
#include <time.h>
#include <stdlib.h>
char *secstotimestr( char *psz_buffer, int32_t i_seconds )
char *vlc_tick_to_str( char *psz_buffer, vlc_tick_t ticks )
{
if( unlikely(i_seconds < 0) )
if( unlikely(ticks < 0) )
{
secstotimestr( psz_buffer + 1, -i_seconds );
vlc_tick_to_str( psz_buffer + 1, -ticks );
*psz_buffer = '-';
return psz_buffer;
}
int i_seconds = SEC_FROM_VLC_TICK(ticks);
div_t d;
d = div( i_seconds, 60 );
......
......@@ -142,11 +142,11 @@ vlc_player_osd_Position(vlc_player_t *player,
}
char time_text[MSTRTIME_MAX_SIZE];
secstotimestr(time_text, SEC_FROM_VLC_TICK(time));
vlc_tick_to_str(time_text, time);
if (input->length != VLC_TICK_INVALID)
{
char len_text[MSTRTIME_MAX_SIZE];
secstotimestr(len_text, SEC_FROM_VLC_TICK(input->length));
vlc_tick_to_str(len_text, input->length);
vouts_osd_Message(vouts, count, "%s / %s", time_text, len_text);
}
else
......
......@@ -65,7 +65,7 @@ input_title_GetName(const struct input_title_t *input_title, int idx,
if (input_title->i_length > 0)
{
strcpy(length_str, " [");
secstotimestr(&length_str[2], SEC_FROM_VLC_TICK(input_title->i_length));
vlc_tick_to_str(&length_str[2], input_title->i_length);
strcat(length_str, "]");
}
else
......