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 (3)
  • Ash's avatar
    qt: clean: Migrated 'getFirstSymbol()' · 573e3cad
    Ash authored and Steve Lhomme's avatar Steve Lhomme committed
    Migrated the 'getFirstSymbol()' trivial member function
    of the MLBaseModel to mlhelper.
    573e3cad
  • Ash's avatar
    qt: clean: Removed redundant member functions · d2c79f0a
    Ash authored and Steve Lhomme's avatar Steve Lhomme committed
    Removed the redundant 'roleToCriteria()' and 'criteriaToName()'
    member functions from the MLBaseModel and its subclasses.
    d2c79f0a
  • Ash's avatar
    qt: clean: Removed 'M_names_to_criteria' QHash · 60bcaecb
    Ash authored and Steve Lhomme's avatar Steve Lhomme committed
    The 'M_names_to_criteria' (or 'criterias') QHash as a static data member
    was useful when the 2 member functions
    'nameToCriteria()' and 'criteriaToName()' accessed it.
    Now only 'nameToCriteria()' accesses this QHash.
    So, it's been moved inside the 'nameToCriteria()' method.
    60bcaecb
Showing
with 50 additions and 240 deletions
......@@ -17,18 +17,10 @@
*****************************************************************************/
#include "mlalbummodel.hpp"
#include "mlhelper.hpp"
#include "util/vlctick.hpp"
QHash<QByteArray, vlc_ml_sorting_criteria_t> MLAlbumModel::M_names_to_criteria = {
{"id", VLC_ML_SORTING_DEFAULT},
{"title", VLC_ML_SORTING_ALPHA},
{"release_year", VLC_ML_SORTING_RELEASEDATE},
{"main_artist", VLC_ML_SORTING_ARTIST},
//{"nb_tracks"},
{"duration", VLC_ML_SORTING_DURATION}
};
MLAlbumModel::MLAlbumModel(QObject *parent)
: MLBaseModel(parent)
{
......@@ -52,12 +44,14 @@ QHash<int, QByteArray> MLAlbumModel::roleNames() const
vlc_ml_sorting_criteria_t MLAlbumModel::nameToCriteria(QByteArray name) const
{
return M_names_to_criteria.value(name, VLC_ML_SORTING_DEFAULT);
}
QByteArray MLAlbumModel::criteriaToName(vlc_ml_sorting_criteria_t criteria) const
{
return M_names_to_criteria.key(criteria, "");
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
{"id", VLC_ML_SORTING_DEFAULT},
{"title", VLC_ML_SORTING_ALPHA},
{"release_year", VLC_ML_SORTING_RELEASEDATE},
{"main_artist", VLC_ML_SORTING_ARTIST},
// {"nb_tracks"},
{"duration", VLC_ML_SORTING_DURATION},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
void MLAlbumModel::onVlcMlEvent(const MLEvent &event)
......@@ -98,23 +92,6 @@ void MLAlbumModel::onVlcMlEvent(const MLEvent &event)
MLBaseModel::onVlcMlEvent( event );
}
vlc_ml_sorting_criteria_t MLAlbumModel::roleToCriteria(int role) const
{
switch (role)
{
case ALBUM_TITLE :
return VLC_ML_SORTING_ALPHA;
case ALBUM_RELEASE_YEAR :
return VLC_ML_SORTING_RELEASEDATE;
case ALBUM_MAIN_ARTIST :
return VLC_ML_SORTING_ARTIST;
case ALBUM_DURATION:
return VLC_ML_SORTING_DURATION;
default:
return VLC_ML_SORTING_DEFAULT;
}
}
QVariant MLAlbumModel::itemRoleData(MLItem *item, const int role) const
{
auto ml_item = static_cast<MLAlbum *>(item);
......
......@@ -60,13 +60,9 @@ protected:
std::unique_ptr<MLListCacheLoader> createMLLoader() const override;
private:
vlc_ml_sorting_criteria_t roleToCriteria(int role) const override;
vlc_ml_sorting_criteria_t nameToCriteria(QByteArray name) const override;
QByteArray criteriaToName(vlc_ml_sorting_criteria_t criteria) const override;
void onVlcMlEvent( const MLEvent &event ) override;
static QHash<QByteArray, vlc_ml_sorting_criteria_t> M_names_to_criteria;
struct Loader : public MLListCacheLoader::MLOp
{
using MLListCacheLoader::MLOp::MLOp;
......
......@@ -20,16 +20,6 @@
#include "util/vlctick.hpp"
#include "mlhelper.hpp"
QHash<QByteArray, vlc_ml_sorting_criteria_t> MLAlbumTrackModel::M_names_to_criteria = {
{"id", VLC_ML_SORTING_DEFAULT},
{"title", VLC_ML_SORTING_ALPHA},
{"album_title", VLC_ML_SORTING_ALBUM},
{"track_number", VLC_ML_SORTING_TRACKNUMBER},
{"release_year", VLC_ML_SORTING_RELEASEDATE},
{"main_artist", VLC_ML_SORTING_ARTIST},
{"duration", VLC_ML_SORTING_DURATION}
};
MLAlbumTrackModel::MLAlbumTrackModel(QObject *parent)
: MLBaseModel(parent)
{
......@@ -93,28 +83,17 @@ QHash<int, QByteArray> MLAlbumTrackModel::roleNames() const
};
}
vlc_ml_sorting_criteria_t MLAlbumTrackModel::roleToCriteria(int role) const
{
switch (role) {
case TRACK_TITLE :
return VLC_ML_SORTING_ALPHA;
case TRACK_NUMBER :
return VLC_ML_SORTING_TRACKNUMBER;
case TRACK_DURATION :
return VLC_ML_SORTING_DURATION;
default:
return VLC_ML_SORTING_DEFAULT;
}
}
vlc_ml_sorting_criteria_t MLAlbumTrackModel::nameToCriteria(QByteArray name) const
{
return M_names_to_criteria.value(name, VLC_ML_SORTING_DEFAULT);
}
QByteArray MLAlbumTrackModel::criteriaToName(vlc_ml_sorting_criteria_t criteria) const
{
return M_names_to_criteria.key(criteria, "");
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
{"id", VLC_ML_SORTING_DEFAULT},
{"title", VLC_ML_SORTING_ALPHA},
{"album_title", VLC_ML_SORTING_ALBUM},
{"track_number", VLC_ML_SORTING_TRACKNUMBER},
{"release_year", VLC_ML_SORTING_RELEASEDATE},
{"main_artist", VLC_ML_SORTING_ARTIST},
{"duration", VLC_ML_SORTING_DURATION},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
void MLAlbumTrackModel::onVlcMlEvent(const MLEvent &event)
......
......@@ -62,13 +62,9 @@ protected:
std::unique_ptr<MLListCacheLoader> createMLLoader() const override;
private:
vlc_ml_sorting_criteria_t roleToCriteria(int role) const override;
vlc_ml_sorting_criteria_t nameToCriteria(QByteArray name) const override;
QByteArray criteriaToName(vlc_ml_sorting_criteria_t criteria) const override;
void onVlcMlEvent( const MLEvent &event ) override;
static QHash<QByteArray, vlc_ml_sorting_criteria_t> M_names_to_criteria;
struct Loader : public MLListCacheLoader::MLOp
{
using MLListCacheLoader::MLOp::MLOp;
......
......@@ -18,11 +18,6 @@
#include "mlartistmodel.hpp"
QHash<QByteArray, vlc_ml_sorting_criteria_t> MLArtistModel::M_names_to_criteria = {
{"name", VLC_ML_SORTING_ALPHA},
{"nb_tracks", VLC_ML_SORTING_TRACKNUMBER},
};
MLArtistModel::MLArtistModel(QObject *parent)
: MLBaseModel(parent)
{
......@@ -64,25 +59,12 @@ QHash<int, QByteArray> MLArtistModel::roleNames() const
};
}
vlc_ml_sorting_criteria_t MLArtistModel::roleToCriteria(int role) const
{
switch (role)
{
case ARTIST_NAME :
return VLC_ML_SORTING_ALPHA;
default :
return VLC_ML_SORTING_DEFAULT;
}
}
vlc_ml_sorting_criteria_t MLArtistModel::nameToCriteria(QByteArray name) const
{
return M_names_to_criteria.value(name, VLC_ML_SORTING_DEFAULT);
}
QByteArray MLArtistModel::criteriaToName(vlc_ml_sorting_criteria_t criteria) const
{
return M_names_to_criteria.key(criteria, "");
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
{"name", VLC_ML_SORTING_ALPHA},
{"nb_tracks", VLC_ML_SORTING_TRACKNUMBER},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
void MLArtistModel::onVlcMlEvent(const MLEvent &event)
......
......@@ -52,13 +52,9 @@ protected:
std::unique_ptr<MLListCacheLoader> createMLLoader() const override;
private:
vlc_ml_sorting_criteria_t roleToCriteria(int role) const override;
vlc_ml_sorting_criteria_t nameToCriteria(QByteArray name) const override;
QByteArray criteriaToName(vlc_ml_sorting_criteria_t criteria) const override;
void onVlcMlEvent(const MLEvent &event) override;
static QHash<QByteArray, vlc_ml_sorting_criteria_t> M_names_to_criteria;
struct Loader : public MLListCacheLoader::MLOp
{
using MLListCacheLoader::MLOp::MLOp;
......
......@@ -278,14 +278,6 @@ void MLBaseModel::onVlcMlEvent(const MLEvent &event)
}
}
QString MLBaseModel::getFirstSymbol(QString str)
{
QString ret("#");
if ( str.length() > 0 && str[0].isLetter() )
ret = str[0].toUpper();
return ret;
}
void MLBaseModel::onVlcMlEvent(void* data, const vlc_ml_event_t* event)
{
auto self = static_cast<MLBaseModel*>(data);
......
......@@ -91,14 +91,9 @@ signals:
protected:
virtual std::unique_ptr<MLListCacheLoader> createMLLoader() const = 0;
virtual vlc_ml_sorting_criteria_t roleToCriteria(int role) const = 0;
static QString getFirstSymbol(QString str);
virtual vlc_ml_sorting_criteria_t nameToCriteria(QByteArray) const {
return VLC_ML_SORTING_DEFAULT;
}
virtual QByteArray criteriaToName(vlc_ml_sorting_criteria_t ) const
virtual vlc_ml_sorting_criteria_t nameToCriteria(QByteArray /* name */) const
{
return "";
return VLC_ML_SORTING_DEFAULT;
}
MLItem *item(int signedidx) const;
......
......@@ -39,10 +39,6 @@ static const int MLGENREMODEL_COVER_BLUR = 4;
//-------------------------------------------------------------------------------------------------
QHash<QByteArray, vlc_ml_sorting_criteria_t> MLGenreModel::M_names_to_criteria = {
{"name", VLC_ML_SORTING_ALPHA}
};
MLGenreModel::MLGenreModel(QObject *parent)
: MLBaseModel(parent)
{
......@@ -121,25 +117,11 @@ void MLGenreModel::onVlcMlEvent(const MLEvent &event)
MLBaseModel::onVlcMlEvent(event);
}
vlc_ml_sorting_criteria_t MLGenreModel::roleToCriteria(int role) const
{
switch (role)
{
case GENRE_NAME:
return VLC_ML_SORTING_ALPHA;
default :
return VLC_ML_SORTING_DEFAULT;
}
}
vlc_ml_sorting_criteria_t MLGenreModel::nameToCriteria(QByteArray name) const
{
return M_names_to_criteria.value(name, VLC_ML_SORTING_DEFAULT);
}
QByteArray MLGenreModel::criteriaToName(vlc_ml_sorting_criteria_t criteria) const
{
return M_names_to_criteria.key(criteria, "");
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
{"name", VLC_ML_SORTING_ALPHA},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
QString MLGenreModel::getCover(MLGenre * genre) const
......
......@@ -65,9 +65,7 @@ protected:
private:
void onVlcMlEvent(const MLEvent &event) override;
vlc_ml_sorting_criteria_t roleToCriteria(int role) const override;
vlc_ml_sorting_criteria_t nameToCriteria(QByteArray name) const override;
QByteArray criteriaToName(vlc_ml_sorting_criteria_t criteria) const override;
QString getCover(MLGenre * genre) const;
......@@ -81,9 +79,6 @@ private:
std::vector<std::unique_ptr<MLItem>> load(vlc_medialibrary_t* ml, const vlc_ml_query_params_t* queryParams) const override;
std::unique_ptr<MLItem> loadItemById(vlc_medialibrary_t* ml, MLItemId itemId) const override;
};
private: // Variables
static QHash<QByteArray, vlc_ml_sorting_criteria_t> M_names_to_criteria;
};
......
......@@ -18,9 +18,6 @@
#include "mlhelper.hpp"
// MediaLibrary includes
#include "mlbasemodel.hpp"
#include <QDir>
QString toValidLocalFile(const char *mrl)
......@@ -37,3 +34,11 @@ QString urlToDisplayString(const QUrl &url)
return displayString;
}
QString getFirstSymbol(const QString &str)
{
QString ret("#");
if ( str.length() > 0 && str[0].isLetter() )
ret = str[0].toUpper();
return ret;
}
......@@ -19,23 +19,17 @@
#ifndef MLHELPER_HPP
#define MLHELPER_HPP
#include <memory>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <memory>
#include <vlc_media_library.h>
#include <QString>
#include <QUrl>
// Forward declarations
class MLBaseModel;
class MLItem;
class MLItemId;
class CoverGenerator;
class QUrl;
template<typename T>
class MLDeleter
{
......@@ -116,4 +110,6 @@ QUrl getParentURLFromMLItem(T *mlItem)
return parentDirUrl;
}
QString getFirstSymbol(const QString &);
#endif // MLHELPER_HPP
......@@ -323,14 +323,6 @@ QVariant MLPlaylistListModel::headerData(int section, Qt::Orientation orientatio
// Protected MLBaseModel implementation
//-------------------------------------------------------------------------------------------------
vlc_ml_sorting_criteria_t MLPlaylistListModel::roleToCriteria(int role) const /* override */
{
if (role == PLAYLIST_NAME)
return VLC_ML_SORTING_ALPHA;
else
return VLC_ML_SORTING_DEFAULT;
}
std::unique_ptr<MLListCacheLoader> MLPlaylistListModel::createMLLoader() const /* override */
{
return std::make_unique<MLListCacheLoader>(m_mediaLib, std::make_shared<MLPlaylistListModel::Loader>(*this, m_playlistType));
......
......@@ -86,8 +86,6 @@ public: // QAbstractItemModel reimplementation
protected: // MLBaseModel implementation
QVariant itemRoleData(MLItem* item, int role = Qt::DisplayRole) const override;
vlc_ml_sorting_criteria_t roleToCriteria(int role) const override;
std::unique_ptr<MLListCacheLoader> createMLLoader() const override;
private: // Functions
......
......@@ -33,17 +33,6 @@
#include "playlist/playlist_controller.hpp"
#include "playlist/media.hpp"
//-------------------------------------------------------------------------------------------------
// Static variables
static const QHash<QByteArray, vlc_ml_sorting_criteria_t> criterias =
{
{"id", VLC_ML_SORTING_DEFAULT},
{"title", VLC_ML_SORTING_ALPHA},
{"duration", VLC_ML_SORTING_DURATION},
{"playcount", VLC_ML_SORTING_PLAYCOUNT},
};
//=================================================================================================
// MLPlaylistModel
//=================================================================================================
......@@ -384,29 +373,14 @@ QVariant MLPlaylistModel::itemRoleData(MLItem *item, int role) const /* override
// Protected MLBaseModel implementation
//-------------------------------------------------------------------------------------------------
vlc_ml_sorting_criteria_t MLPlaylistModel::roleToCriteria(int role) const /* override */
{
switch (role)
{
case MEDIA_TITLE:
return VLC_ML_SORTING_ALPHA;
case MEDIA_DURATION:
return VLC_ML_SORTING_DURATION;
case MEDIA_PLAYCOUNT:
return VLC_ML_SORTING_PLAYCOUNT;
default:
return VLC_ML_SORTING_DEFAULT;
}
}
vlc_ml_sorting_criteria_t MLPlaylistModel::nameToCriteria(QByteArray name) const /* override */
{
return criterias.value(name, VLC_ML_SORTING_DEFAULT);
}
QByteArray MLPlaylistModel::criteriaToName(vlc_ml_sorting_criteria_t criteria) const /* override */
{
return criterias.key(criteria, "");
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
{"id", VLC_ML_SORTING_DEFAULT},
{"title", VLC_ML_SORTING_ALPHA},
{"duration", VLC_ML_SORTING_DURATION},
{"playcount", VLC_ML_SORTING_PLAYCOUNT},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
//-------------------------------------------------------------------------------------------------
......
......@@ -68,12 +68,8 @@ signals:
protected: // MLBaseModel implementation
QVariant itemRoleData(MLItem *item, int role = Qt::DisplayRole) const override;
vlc_ml_sorting_criteria_t roleToCriteria(int role) const override;
vlc_ml_sorting_criteria_t nameToCriteria(QByteArray name) const override;
QByteArray criteriaToName(vlc_ml_sorting_criteria_t criteria) const override;
std::unique_ptr<MLListCacheLoader> createMLLoader() const override;
protected: // MLBaseModel reimplementation
......
......@@ -68,12 +68,6 @@ protected:
std::unique_ptr<MLListCacheLoader> createMLLoader() const override;
private:
vlc_ml_sorting_criteria_t roleToCriteria( int /* role */ ) const override{
return VLC_ML_SORTING_DEFAULT;
}
vlc_ml_sorting_criteria_t nameToCriteria( QByteArray /* name */ ) const override{
return VLC_ML_SORTING_DEFAULT;
}
void onVlcMlEvent( const MLEvent &event ) override;
struct Loader : public MLListCacheLoader::MLOp
......
......@@ -106,18 +106,6 @@ void MLUrlModel::deleteStream( const MLItemId itemId )
});
}
vlc_ml_sorting_criteria_t MLUrlModel::roleToCriteria(int role) const
{
switch (role) {
case URL_URL :
return VLC_ML_SORTING_DEFAULT;
case URL_LAST_PLAYED_DATE :
return VLC_ML_SORTING_LASTMODIFICATIONDATE;
default:
return VLC_ML_SORTING_DEFAULT;
}
}
void MLUrlModel::onVlcMlEvent(const MLEvent &event)
{
switch (event.i_type)
......
......@@ -71,7 +71,6 @@ protected:
std::unique_ptr<MLListCacheLoader> createMLLoader() const override;
private:
vlc_ml_sorting_criteria_t roleToCriteria(int role) const override;
void onVlcMlEvent( const MLEvent &event ) override;
struct Loader : public MLListCacheLoader::MLOp
......
......@@ -42,12 +42,6 @@
static const int MLVIDEOFOLDERSMODEL_COVER_WIDTH = 260 * 3; // 16 / 10 ratio
static const int MLVIDEOFOLDERSMODEL_COVER_HEIGHT = 162 * 3;
static const QHash<QByteArray, vlc_ml_sorting_criteria_t> criterias =
{
{ "title", VLC_ML_SORTING_ALPHA },
{ "duration", VLC_ML_SORTING_DURATION }
};
// Ctor / dtor
/* explicit */ MLVideoFoldersModel::MLVideoFoldersModel(QObject * parent) : MLBaseModel(parent) {}
......@@ -102,28 +96,12 @@ QVariant MLVideoFoldersModel::itemRoleData(MLItem * item, const int role) const
}
}
vlc_ml_sorting_criteria_t MLVideoFoldersModel::roleToCriteria(int role) const /* override */
{
switch (role)
{
case FOLDER_TITLE:
return VLC_ML_SORTING_ALPHA;
case FOLDER_DURATION:
return VLC_ML_SORTING_DURATION;
default:
return VLC_ML_SORTING_DEFAULT;
}
}
vlc_ml_sorting_criteria_t MLVideoFoldersModel::nameToCriteria(QByteArray name) const /* override */
{
return criterias.value(name, VLC_ML_SORTING_DEFAULT);
}
QByteArray MLVideoFoldersModel::criteriaToName(vlc_ml_sorting_criteria_t criteria) const
/* override */
{
return criterias.key(criteria, "");
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
{ "title", VLC_ML_SORTING_ALPHA },
{ "duration", VLC_ML_SORTING_DURATION },
}.value(name, VLC_ML_SORTING_DEFAULT);
}
std::unique_ptr<MLListCacheLoader>
......