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
  • djain/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
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (5)
Showing
with 41 additions and 57 deletions
......@@ -63,9 +63,9 @@ unsigned int MLAlbum::getNbTracks() const
return m_nbTracks;
}
int64_t MLAlbum::getDuration() const
VLCTick MLAlbum::getDuration() const
{
return m_duration;
return VLCTick::fromMS(m_duration);
}
QString MLAlbum::getPresName() const
......
......@@ -30,6 +30,7 @@
#include "vlc_media_library.h"
#include "mlhelper.hpp"
#include "mlqmltypes.hpp"
#include "util/vlctick.hpp"
class MLAlbum : public QObject, public MLItem
{
......@@ -44,7 +45,7 @@ public:
QString getCover() const;
QString getArtist() const;
unsigned int getNbTracks() const;
int64_t getDuration() const;
VLCTick getDuration() const;
Q_INVOKABLE QString getPresName() const;
Q_INVOKABLE QString getPresImage() const;
......
......@@ -91,9 +91,9 @@ unsigned int MLAlbumTrack::getDiscNumber() const
return m_discNumber;
}
int64_t MLAlbumTrack::getDuration() const
VLCTick MLAlbumTrack::getDuration() const
{
return m_duration;
return VLCTick::fromMS(m_duration);
}
QString MLAlbumTrack::getMRL() const
......
......@@ -30,6 +30,7 @@
#include <vlc_media_library.h>
#include "mlhelper.hpp"
#include "mlqmltypes.hpp"
#include "util/vlctick.hpp"
class MLAlbumTrack : public QObject, public MLItem
{
......@@ -44,7 +45,7 @@ public:
QString getCover() const;
unsigned int getTrackNumber() const;
unsigned int getDiscNumber() const;
int64_t getDuration() const;
VLCTick getDuration() const;
QString getMRL() const;
private:
......
......@@ -27,6 +27,7 @@
#include "medialib.hpp"
#include "mlhelper.hpp"
#include "util/vlctick.hpp"
MLBookmarkModel::MLBookmarkModel( MediaLib* medialib, vlc_player_t *player,
QObject *parent )
......@@ -115,7 +116,7 @@ QVariant MLBookmarkModel::data( const QModelIndex &index, int role ) const
case 0:
return QVariant::fromValue( QString::fromUtf8( bookmark.psz_name ) );
case 1:
return QVariant::fromValue( MsToString( bookmark.i_time ) );
return QVariant::fromValue( VLCTick::fromMS( bookmark.i_time ).formatHMS() );
case 2:
return QVariant::fromValue( QString::fromUtf8( bookmark.psz_description ) );
default:
......
......@@ -56,9 +56,9 @@ QString MLFolder::getMRL() const
return m_mrl;
}
int64_t MLFolder::getDuration() const
VLCTick MLFolder::getDuration() const
{
return m_duration;
return VLCTick::fromMS(m_duration);
}
unsigned int MLFolder::getCount() const
......
......@@ -23,6 +23,7 @@
// MediaLibrary includes
#include "mlqmltypes.hpp"
#include "util/vlctick.hpp"
class MLFolder : public MLItem
{
......@@ -37,7 +38,7 @@ public: // Interface
QString getMRL() const;
int64_t getDuration() const;
VLCTick getDuration() const;
unsigned int getCount() const;
......
......@@ -48,9 +48,9 @@ QString MLGroup::getTitle() const
//-------------------------------------------------------------------------------------------------
int64_t MLGroup::getDuration() const
VLCTick MLGroup::getDuration() const
{
return m_duration;
return VLCTick::fromMS(m_duration);
}
unsigned int MLGroup::getDate() const
......
......@@ -27,6 +27,7 @@
// MediaLibrary includes
#include "mlqmltypes.hpp"
#include "util/vlctick.hpp"
class MLGroup : public MLItem
{
......@@ -36,7 +37,7 @@ public:
public: // Interface
QString getTitle() const;
int64_t getDuration() const;
VLCTick getDuration() const;
unsigned int getDate() const;
......
......@@ -23,31 +23,6 @@
#include <QDir>
QString MsToString( int64_t time , bool doShort )
{
if (time < 0)
return "--:--";
int t_sec = time / 1000;
int sec = t_sec % 60;
int min = (t_sec / 60) % 60;
int hour = t_sec / 3600;
if (hour == 0)
return QString("%1:%2")
.arg(min, 2, 10, QChar('0'))
.arg(sec, 2, 10, QChar('0'));
else if ( doShort )
return QString("%1h%2")
.arg(hour)
.arg(min, 2, 10, QChar('0'));
else
return QString("%1:%2:%3")
.arg(hour, 2, 10, QChar('0'))
.arg(min, 2, 10, QChar('0'))
.arg(sec, 2, 10, QChar('0'));
}
QString toValidLocalFile(const char *mrl)
{
QUrl url(mrl);
......
......@@ -99,8 +99,6 @@ void thumbnailCopy(const MLListRange<T> &list, O dst, const int max)
}
}
QString MsToString( int64_t time, bool doShort = false );
QString urlToDisplayString(const QUrl &url);
#endif // MLHELPER_HPP
......@@ -45,9 +45,9 @@ QString MLPlaylist::getName() const
//-------------------------------------------------------------------------------------------------
int64_t MLPlaylist::getDuration() const
VLCTick MLPlaylist::getDuration() const
{
return m_duration;
return VLCTick::fromMS(m_duration);
}
unsigned int MLPlaylist::getCount() const
......
......@@ -25,6 +25,7 @@
// MediaLibrary includes
#include "mlqmltypes.hpp"
#include "util/vlctick.hpp"
class MLPlaylist : public MLItem
{
......@@ -34,7 +35,7 @@ public:
public: // Interface
QString getName() const;
int64_t getDuration() const;
VLCTick getDuration() const;
unsigned int getCount() const;
......
......@@ -17,6 +17,7 @@
*****************************************************************************/
#include "mlplaylistmedia.hpp"
#include "mlhelper.hpp"
// VLC includes
#include <qt.hpp>
......@@ -131,9 +132,9 @@ void MLPlaylistMedia::setThumbnail(const QString& thumbnail, vlc_ml_thumbnail_st
//-------------------------------------------------------------------------------------------------
int64_t MLPlaylistMedia::getDuration() const
VLCTick MLPlaylistMedia::getDuration() const
{
return m_duration;
return VLCTick::fromMS(m_duration);
}
//-------------------------------------------------------------------------------------------------
......@@ -170,9 +171,9 @@ double MLPlaylistMedia::getProgress() const
return m_progress;
}
QString MLPlaylistMedia::getProgressTime() const
VLCTick MLPlaylistMedia::getProgressTime() const
{
return MsToString(m_duration * m_progress);
return VLCTick::fromMS(m_duration * m_progress);
}
//-------------------------------------------------------------------------------------------------
......
......@@ -26,6 +26,7 @@
// MediaLibrary includes
// NOTE: We need that header for VideoDescription and AudioDescription.
#include "mlvideo.hpp"
#include "util/vlctick.hpp"
// Qt includes
#include <QUrl>
......@@ -48,7 +49,7 @@ public: // Interface
QString getThumbnail(vlc_ml_thumbnail_status_t* status = nullptr);
void setThumbnail(const QString& thumbnail, vlc_ml_thumbnail_status_t status);
int64_t getDuration() const;
VLCTick getDuration() const;
QString getResolutionName() const;
......@@ -58,7 +59,7 @@ public: // Interface
QString getMRLDisplay() const;
double getProgress () const;
QString getProgressTime() const;
VLCTick getProgressTime() const;
unsigned int getPlayCount() const;
......
......@@ -18,6 +18,8 @@
#include "mlrecentsmodel.hpp"
#include <QDateTime>
#include "mlhelper.hpp"
MLRecentMedia::MLRecentMedia( const vlc_ml_media_t *media )
: MLItem( MLItemId( media->i_id, VLC_ML_PARENT_UNKNOWN ) )
......
......@@ -27,7 +27,6 @@
#include <vlc_media_library.h>
#include "mlbasemodel.hpp"
#include "mlvideo.hpp"
#include <QDateTime>
......
......@@ -17,6 +17,7 @@
*****************************************************************************/
#include "mlrecentsvideomodel.hpp"
#include "mlhelper.hpp"
// Ctor / dtor
......
......@@ -21,6 +21,7 @@
#include <cassert>
#include <vlc_thumbnailer.h>
#include "mlhelper.hpp"
VideoDescription::VideoDescription(const QString &codec, const QString &language, const unsigned int fps)
: m_codec(codec)
......@@ -168,9 +169,9 @@ void MLVideo::setThumbnail(vlc_ml_thumbnail_status_t status, QString mrl)
m_thumbnail = mrl;
}
int64_t MLVideo::getDuration() const
VLCTick MLVideo::getDuration() const
{
return m_duration;
return VLCTick::fromMS(m_duration);
}
QString MLVideo::getMRL() const
......@@ -202,9 +203,9 @@ unsigned int MLVideo::getPlayCount() const
return m_playCount;
}
QString MLVideo::getProgressTime() const
VLCTick MLVideo::getProgressTime() const
{
return MsToString(m_duration * m_progress);
return VLCTick::fromMS(m_duration * m_progress);
}
QList<VideoDescription> MLVideo::getVideoDesc() const
......
......@@ -28,8 +28,8 @@
#include <QUrl>
#include <vlc_media_library.h>
#include "mlhelper.hpp"
#include "mlqmltypes.hpp"
#include "util/vlctick.hpp"
#include <functional>
......@@ -97,14 +97,14 @@ public:
QString getTitle() const;
QString getThumbnail(vlc_ml_thumbnail_status_t* status);
void setThumbnail(vlc_ml_thumbnail_status_t status, QString mrl);
int64_t getDuration() const;
VLCTick getDuration() const;
QString getResolutionName() const;
QString getChannel() const;
QString getMRL() const;
QString getDisplayMRL() const;
float getProgress() const;
unsigned int getPlayCount() const;
QString getProgressTime() const;
VLCTick getProgressTime() const;
QList<AudioDescription> getAudioDesc() const;
QList<VideoDescription> getVideoDesc() const;
......