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 (8)
Showing
with 58 additions and 43 deletions
......@@ -28,6 +28,7 @@
#include <QStyleOptionGraphicsItem>
#include <QGraphicsSceneHoverEvent>
#include <QStyle>
#include <QTimeZone>
#include "EPGItem.hpp"
#include "EPGView.hpp"
......@@ -151,7 +152,7 @@ uint16_t EPGItem::eventID() const
bool EPGItem::setData( const vlc_epg_event_t *data )
{
QDateTime newtime = QDateTime::fromSecsSinceEpoch( data->i_start );
QDateTime newtime = QDateTime::fromSecsSinceEpoch( data->i_start, QTimeZone::utc() );
QString newname = qfu( data->psz_name );
QString newdesc = qfu( data->psz_description );
QString newshortdesc = qfu( data->psz_short_description );
......
......@@ -21,6 +21,8 @@
#include "EPGItem.hpp"
#include "EPGView.hpp"
#include <QTimeZone>
EPGProgram::EPGProgram( EPGView *view_, const vlc_epg_t *p_epg ) : QObject( view_ )
{
name = QString(p_epg->psz_name);
......@@ -96,7 +98,7 @@ void EPGProgram::updateEvents( const vlc_epg_event_t * const * pp_events, size_t
for( size_t i=0; i<i_events; i++ )
{
const vlc_epg_event_t *p_event = pp_events[i];
QDateTime eventStart = QDateTime::fromSecsSinceEpoch( p_event->i_start );
QDateTime eventStart = QDateTime::fromSecsSinceEpoch( p_event->i_start, QTimeZone::utc() );
if( !mindate->isValid() || eventStart < *mindate )
*mindate = eventStart;
......
......@@ -30,6 +30,7 @@
#include <QScrollBar>
#include <QLabel>
#include <QDateTime>
#include <QTimeZone>
#include "EPGWidget.hpp"
#include "EPGRuler.hpp"
......@@ -108,7 +109,7 @@ void EPGWidget::updateEPG( input_item_t *p_input_item )
vlc_mutex_lock( & p_input_item->lock );
m_epgView->updateEPG( p_input_item->pp_epg, p_input_item->i_epg );
m_epgView->setEpgTime( ( p_input_item->i_epg_time ) ?
QDateTime::fromSecsSinceEpoch( p_input_item->i_epg_time ) :
QDateTime::fromSecsSinceEpoch( p_input_item->i_epg_time, QTimeZone::utc() ) :
QDateTime() );
vlc_mutex_unlock( & p_input_item->lock );
......
......@@ -40,7 +40,7 @@
#include <QFileDialog>
#include <QGraphicsScene>
#include <QPainter>
#include <QRegExp>
#include <QRegularExpression>
#include <QApplication>
#include <QScreen>
......@@ -112,8 +112,8 @@ static QString OptionFromWidgetName( QObject *obj )
{
/* Gruik ? ... nah */
return obj->objectName()
.remove( QRegExp( "Slider|Combo|Dial|Check|Spin|Text" ) )
.replace( QRegExp( "([A-Z])" ), "-\\1" )
.remove( QRegularExpression( "Slider|Combo|Dial|Check|Spin|Text" ) )
.replace( QRegularExpression( "([A-Z])" ), "-\\1" )
.toLower();
}
......
......@@ -48,6 +48,7 @@
#include <QTextEdit>
#include <QApplication>
#include <QPushButton>
#include <QRegularExpression>
/************************************************************************
* Single panels
......@@ -258,7 +259,7 @@ void MetaPanel::update( const SharedInputItem& p_item )
{
currentURL = newURL;
lblURL->setText( "<a href='" + currentURL + "'>" +
currentURL.remove( QRegExp( ".*://") ) + "</a>" );
currentURL.remove( QRegularExpression( ".*://") ) + "</a>" );
}
}
free( psz_meta );
......
......@@ -29,7 +29,7 @@
#include "util/qt_dirs.hpp"
#include "playlist/playlist_controller.hpp"
#include <QRegExp>
#include <QRegularExpression>
#include <QMenu>
#include <vlc_url.h>
......@@ -473,7 +473,7 @@ QStringList OpenDialog::SeparateEntries( const QString& entries )
int index = 0;
while( index < entries.count() )
{
int delim_pos = entries.indexOf( QRegExp( "\\s+|\"" ), index );
int delim_pos = entries.indexOf( QRegularExpression( "\\s+|\"" ), index );
if( delim_pos < 0 ) delim_pos = entries.count() - 1;
entry += entries.mid( index, delim_pos - index + 1 );
index = delim_pos + 1;
......
......@@ -55,6 +55,7 @@
#include <QUrl>
#include <QMimeData>
#include <QDropEvent>
#include <QRegularExpression>
#define I_DEVICE_TOOLTIP \
I_DIR_OR_FOLDER( N_("Select a device or a VIDEO_TS directory"), \
......@@ -70,7 +71,7 @@
targetCombo ## StringList << QString( ppsz_devlist[ i ] ); \
targetCombo->addItems( QDir( "/dev/" )\
.entryList( targetCombo ## StringList, QDir::System )\
.replaceInStrings( QRegExp("^"), "/dev/" ) \
.replaceInStrings( QRegularExpression("^"), "/dev/" ) \
);
static const char psz_devModule[][8] = { "v4l2", "pvr", "dtv",
......@@ -409,7 +410,7 @@ void DiscOpenPanel::onFocus()
displayName = displayName + " - " + psz_title;
}
ui.deviceCombo->addItem( displayName, psz_drive );
ui.deviceCombo->addItem( displayName, qfu(psz_drive) );
free( psz_drive );
free( psz_title );
}
......@@ -421,7 +422,7 @@ void DiscOpenPanel::onFocus()
}
char *psz_config = config_GetPsz( "dvd" );
int temp = ui.deviceCombo->findData( psz_config, Qt::UserRole, Qt::MatchStartsWith );
int temp = ui.deviceCombo->findData( qfu(psz_config), Qt::UserRole, Qt::MatchStartsWith );
free( psz_config );
if( temp != -1 )
ui.deviceCombo->setCurrentIndex( temp );
......@@ -860,9 +861,9 @@ void CaptureOpenPanel::initialize()
QStringList nodes = QDir( "/dev/snd" ).entryList( patterns,
QDir::System );
QStringList names = nodes.replaceInStrings( QRegExp("^pcmC"), "hw:" )
.replaceInStrings( QRegExp("c$"), "" )
.replaceInStrings( QRegExp("D"), "," );
QStringList names = nodes.replaceInStrings( QRegularExpression("^pcmC"), "hw:" )
.replaceInStrings( QRegularExpression("c$"), "" )
.replaceInStrings( QRegularExpression("D"), "," );
v4l2AudioDevice->addItems( names );
}
v4l2AudioDevice->clearEditText();
......@@ -1081,9 +1082,9 @@ void CaptureOpenPanel::initialize()
QStringList nodes = QDir( "/dev/snd" ).entryList( patterns,
QDir::System );
QStringList names = nodes.replaceInStrings( QRegExp("^pcmC"), "hw:" )
.replaceInStrings( QRegExp("c$"), "" )
.replaceInStrings( QRegExp("D"), "," );
QStringList names = nodes.replaceInStrings( QRegularExpression("^pcmC"), "hw:" )
.replaceInStrings( QRegularExpression("c$"), "" )
.replaceInStrings( QRegularExpression("D"), "," );
pvrAudioDevice->addItems( names );
}
pvrAudioDevice->clearEditText();
......
......@@ -840,7 +840,7 @@ QVariant AddonsListModel::Addon::data( int role ) const
returnval = QVariant( (int) p_entry->i_score );
break;
case VersionRole:
returnval = QVariant( p_entry->psz_version );
returnval = QVariant( qfu(p_entry->psz_version) );
break;
case AuthorRole:
returnval = qfu( p_entry->psz_author );
......
......@@ -380,7 +380,7 @@ QVariant ExpertPrefsTableModel::data( const QModelIndex &index, int role ) const
return QString( "#%1" ).arg( item->cfg_item->value.i, 0, 16 );
return QString( "%1" ).arg( item->cfg_item->value.i );
case CONFIG_ITEM_STRING:
return item->cfg_item->value.psz;
return QVariant( qfu(item->cfg_item->value.psz) );
default:
break;
}
......
......@@ -60,6 +60,7 @@
#include <QFileDialog>
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QRegularExpression>
#include <cassert>
#include <math.h>
......@@ -655,7 +656,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
<< "dvd*" << "scd*" << "sr*" << "sg*" << "cd*";
ui.DVDDeviceComboBox->addItems( QDir( "/dev/" )
.entryList( DVDDeviceComboBoxStringList, QDir::System )
.replaceInStrings( QRegExp("^"), "/dev/" )
.replaceInStrings( QRegularExpression("^"), "/dev/" )
);
#endif
configGeneric<StringConfigControl>( "dvd", ui.DVDLabel,
......@@ -736,7 +737,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
DWORD len = 256;
if( RegQueryValueEx( h_key, TEXT("Lang"), NULL, NULL, (LPBYTE) &szData, &len ) == ERROR_SUCCESS ) {
langReg = FromWide( szData );
ui.langCombo->setCurrentIndex( ui.langCombo->findData(langReg) );
ui.langCombo->setCurrentIndex( ui.langCombo->findData(qfu(langReg)) );
}
}
free( langReg);
......
......@@ -31,7 +31,7 @@
#include <QLabel>
#include <QMessageBox>
#include <QRadioButton>
#include <QRegExp>
#include <QRegularExpression>
#include <QButtonGroup>
#include <QSpinBox>
#include <QUrl>
......@@ -200,9 +200,9 @@ void VLCProfileSelector::saveProfiles()
void VLCProfileSelector::updateOptions( int i )
{
QString options = profileBox->itemData( i ).toString();
QRegExp rx(OLDFORMAT);
QRegularExpression rx(OLDFORMAT);
if ( !options.contains( ";" ) ) return;
if ( rx.indexIn( options ) != -1 )
if ( rx.match( options ).hasMatch() )
return updateOptionsOldFormat( i );
transcode.clear();
......@@ -655,8 +655,8 @@ void VLCProfileEditor::codecSelected()
void VLCProfileEditor::fillProfile( const QString& qs )
{
QRegExp rx(OLDFORMAT);
if ( rx.indexIn( qs ) != -1 ) return fillProfileOldFormat( qs );
QRegularExpression rx(OLDFORMAT);
if ( rx.match( qs ).hasMatch() ) return fillProfileOldFormat( qs );
QStringList tuples = qs.split( ";" );
foreach ( const QString &tuple, tuples )
......
......@@ -36,6 +36,7 @@
#include <QLineEdit>
#include <QFileDialog>
#include <QUrl>
#include <QRegularExpression>
#define I_FILE_SLASH_DIR \
I_DIR_OR_FOLDER( N_("File/Directory"), N_("File/Folder") )
......@@ -148,11 +149,11 @@ QString FileDestBox::getMRL( const QString& mux )
QString outputfile = fileEdit->text();
if( !mux.isEmpty() )
{
if( outputfile.contains( QRegExp("\\..{2,4}$")) &&
if( outputfile.contains( QRegularExpression("\\..{2,4}$")) &&
!outputfile.endsWith(mux) )
{
/* Replace the extension according to muxer */
outputfile.replace(QRegExp("\\..{2,4}$"),"."+mux);
outputfile.replace(QRegularExpression("\\..{2,4}$"),"."+mux);
} else if (!outputfile.endsWith( mux ) )
{
m.option( "mux", mux );
......@@ -218,7 +219,7 @@ QString HTTPDestBox::getMRL( const QString& mux )
/* Path-extension is primary muxer to use if possible,
otherwise check for mux-choise and see that it isn't mp4
then fallback to flv*/
if ( !path.contains(QRegExp("\\..{2,3}$") ) )
if ( !path.contains(QRegularExpression("\\..{2,3}$") ) )
{
if( !mux.isEmpty() && mux.compare("mp4") )
m.option( "mux", mux );
......
......@@ -779,14 +779,14 @@ void VLMWrapper::EditSchedule( const QString& name, const QString& input,
if( _scherepeatnumber > 0 )
{
command = "setup \"" + name + "\" repeat \"" + _scherepeatnumber + "\"";
command = "setup \"" + name + "\" repeat \"" + QString::number(_scherepeatnumber) + "\"";
vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
vlm_MessageDelete( message );
}
if( _repeatDays > 0 )
{
command = "setup \"" + name + "\" period \"" + _repeatDays + "\"";
command = "setup \"" + name + "\" period \"" + QString::number(_repeatDays) + "\"";
vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
vlm_MessageDelete( message );
}
......
......@@ -212,13 +212,13 @@ void MediaLib::addAndPlay(const MLItemId & itemId, const QStringList &options )
void MediaLib::addAndPlay(const QString& mrl, const QStringList &options)
{
vlc::playlist::Media media{ mrl, mrl, options };
m_intf->p_mainPlaylistController->append( {media}, true );
m_intf->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{media}, true );
}
void MediaLib::addAndPlay(const QUrl& mrl, const QStringList &options)
{
vlc::playlist::Media media{ mrl.toString(QUrl::None), mrl.fileName(), options };
m_intf->p_mainPlaylistController->append( {media}, true );
m_intf->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{media}, true );
}
......
......@@ -17,14 +17,17 @@
*****************************************************************************/
#include "mlrecentsmodel.hpp"
#include <QDateTime>
#include <QTimeZone>
#include "mlhelper.hpp"
MLRecentMedia::MLRecentMedia( const vlc_ml_media_t *media )
: MLItem( MLItemId( media->i_id, VLC_ML_PARENT_UNKNOWN ) )
, m_url ( media->p_files->i_nb_items > 0 ? media->p_files->p_items[0].psz_mrl : "" )
, m_lastPlayedDate(QDateTime::fromSecsSinceEpoch( media->i_last_played_date ))
, m_lastPlayedDate(QDateTime::fromSecsSinceEpoch( media->i_last_played_date, QTimeZone::utc() ))
{
}
......
......@@ -19,6 +19,7 @@
#include "mlurlmodel.hpp"
#include <QDateTime>
#include <QTimeZone>
MLUrlModel::MLUrlModel(QObject *parent)
: MLBaseModel(parent)
......@@ -133,7 +134,7 @@ MLUrl::MLUrl(const vlc_ml_media_t *_data)
: MLItem( MLItemId( _data->i_id, VLC_ML_PARENT_UNKNOWN ) )
, m_url( _data->p_files->i_nb_items > 0 ? _data->p_files->p_items[0].psz_mrl : "" )
, m_lastPlayedDate(
QDateTime::fromSecsSinceEpoch( _data->i_last_played_date ).toString( QLocale::system().dateFormat( QLocale::ShortFormat ) )
QDateTime::fromSecsSinceEpoch( _data->i_last_played_date, QTimeZone::utc() ).toString( QLocale::system().dateFormat( QLocale::ShortFormat ) )
)
{
}
......
......@@ -946,7 +946,7 @@ void VLCMenuBar::updateAudioDevice( qt_intf_t * p_intf, QMenu *current )
for( int i = 0; i < i_result; i++ )
{
action = new QAction( qfue( names[i] ), actionGroup );
action->setData( ids[i] );
action->setData( qfu(ids[i]) );
action->setCheckable( true );
if( (selected && !strcmp( ids[i], selected ) ) ||
(selected == NULL && ids[i] && ids[i][0] == '\0' ) )
......
......@@ -31,6 +31,7 @@
#include <QPainter>
#include <QSignalMapper>
#include <QScreen>
#include <QActionGroup>
namespace
{
......@@ -39,7 +40,7 @@ namespace
assert(order == Qt::AscendingOrder || order == Qt::DescendingOrder);
QStyleOptionHeader headerOption;
headerOption.init(widget);
headerOption.initFrom(widget);
headerOption.sortIndicator = (order == Qt::AscendingOrder)
? QStyleOptionHeader::SortDown
: QStyleOptionHeader::SortUp;
......
......@@ -130,7 +130,7 @@ bool NetworkDeviceModel::addToPlaylist(int index)
return false;
auto item = m_items[index];
vlc::playlist::Media media{ item.inputItem.get() };
m_ctx->getIntf()->p_mainPlaylistController->append( { media }, false);
m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, false);
return true;
}
......@@ -168,7 +168,7 @@ bool NetworkDeviceModel::addAndPlay(int index)
return false;
auto item = m_items[index];
vlc::playlist::Media media{ item.inputItem.get() };
m_ctx->getIntf()->p_mainPlaylistController->append( { media }, true);
m_ctx->getIntf()->p_mainPlaylistController->append(QVector<vlc::playlist::Media>{ media }, true);
return true;
}
......
......@@ -18,6 +18,8 @@
#include "networkmediamodel.hpp"
#include <QTimeZone>
#include "medialibrary/mlhelper.hpp"
#include "playlist/media.hpp"
......@@ -257,7 +259,7 @@ bool NetworkMediaModel::addToPlaylist(const int index)
return false;
auto item = m_items[index];
vlc::playlist::Media media{ item.tree.media.get() };
m_ctx->getIntf()->p_mainPlaylistController->append( { media }, false);
m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, false);
return true;
}
......@@ -300,7 +302,7 @@ bool NetworkMediaModel::addAndPlay(int index)
return false;
auto item = m_items[index];
vlc::playlist::Media media{ item.tree.media.get() };
m_ctx->getIntf()->p_mainPlaylistController->append( { media }, true);
m_ctx->getIntf()->p_mainPlaylistController->append( QVector<vlc::playlist::Media>{ media }, true);
return true;
}
......@@ -601,7 +603,7 @@ void NetworkMediaModel::refreshMediaList( MediaTreePtr tree,
free(str);
if (ok)
item.fileModified = QDateTime::fromSecsSinceEpoch(time);
item.fileModified = QDateTime::fromSecsSinceEpoch(time, QTimeZone::utc());
}
if ( m_mediaLib && item.canBeIndexed == true )
......