Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
35 changes: 21 additions & 14 deletions cmake/CheckExternalLibraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -103,24 +103,31 @@ endif()

# vaapi: fedora:libva-devel debian:libva-dev
if(ENABLE_VAAPI)
# No need to check for the individual features below. Libva 1.2 was released
# in 2013 and contains all these features. Just require libva >= 1.2.
# ~~~
# 1.2.0 vaCreateSurfaces(0, 0, 0, 0, 0, 0, 0, 0)
# 1.1.0 vaGetDisplayDRM
# 1.1.0 vaGetDisplay
# 1.0.0 "VA_CHECK_VERSION(1, 0, 0)
# ~~~
pkg_check_modules(VAAPI "libva>=1.2" IMPORTED_TARGET)
add_build_config(PkgConfig::VAAPI "vaapi")
if(TARGET PkgConfig::VAAPI)
set(CONFIG_VAAPI TRUE)
pkg_check_modules(VA-DRM "libva-drm" REQUIRED IMPORTED_TARGET)
pkg_check_modules(VA-GLX "libva-glx" REQUIRED IMPORTED_TARGET)
pkg_check_modules(VA-X11 "libva-x11" REQUIRED IMPORTED_TARGET)
target_link_libraries(
PkgConfig::VAAPI INTERFACE PkgConfig::VA-X11 PkgConfig::VA-GLX
PkgConfig::VA-DRM)

pkg_check_modules(VAAPI-DRM "libva-drm" IMPORTED_TARGET)
add_build_config(PkgConfig::VAAPI-DRM "vaapi_drm")
if(TARGET PkgConfig::VAAPI-DRM)
set(CONFIG_VAAPI_DRM TRUE)
target_link_libraries(PkgConfig::VAAPI INTERFACE PkgConfig::VAAPI-DRM)
endif()

pkg_check_modules(VAAPI-GLX "libva-glx" IMPORTED_TARGET)
add_build_config(PkgConfig::VAAPI-GLX "vaapi_glx")
if(TARGET PkgConfig::VAAPI-GLX)
set(CONFIG_VAAPI_GLX TRUE)
target_link_libraries(PkgConfig::VAAPI INTERFACE PkgConfig::VAAPI-GLX)
endif()

pkg_check_modules(VAAPI-X11 "libva-x11" IMPORTED_TARGET)
add_build_config(PkgConfig::VAAPI-X11 "vaapi_x11")
if(TARGET PkgConfig::VAAPI-X11)
set(CONFIG_VAAPI_X11 TRUE)
target_link_libraries(PkgConfig::VAAPI INTERFACE PkgConfig::VAAPI-X11)
endif()
endif()
endif()

Expand Down
2 changes: 2 additions & 0 deletions mythplugins/mytharchive/mytharchive/editmetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,5 @@ void EditMetadataDialog::cancelPressed(void)
emit haveResult(false, m_sourceMetadata);
Close();
}

#include "moc_editmetadata.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mytharchive/mytharchive/exportnative.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -492,3 +492,5 @@ void ExportNative::handleAddVideo()
if (selector->Create())
mainStack->AddScreen(selector);
}

#include "moc_exportnative.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mytharchive/mytharchive/fileselector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -439,3 +439,5 @@ void FileSelector::updateFileList()
"MythArchive: current directory does not exist!");
}
}

#include "moc_fileselector.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mytharchive/mytharchive/importnative.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -649,3 +649,5 @@ void ImportNative::gotCallsign(const QString& value)
m_localCallsignText->SetText(query.value(3).toString());
}
}

#include "moc_importnative.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mytharchive/mytharchive/logviewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,5 @@ void LogViewer::ShowMenu()
menuPopup->AddButton(tr("Show Progress Log"), &LogViewer::showProgressLog);
menuPopup->AddButton(tr("Show Full Log"), &LogViewer::showFullLog);
}

#include "moc_logviewer.cpp"
2 changes: 1 addition & 1 deletion mythplugins/mytharchive/mytharchive/mythburn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1176,4 +1176,4 @@ void BurnMenu::doBurn(int mode)
showLogViewer();
}

/* vim: set expandtab tabstop=4 shiftwidth=4: */
#include "moc_mythburn.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mytharchive/mytharchive/recordingselector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -514,3 +514,5 @@ void RecordingSelector::updateSelectedList()
}
}
}

#include "moc_recordingselector.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mytharchive/mytharchive/selectdestination.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -322,3 +322,5 @@ void SelectDestination::filenameEditLostFocus()
m_freeSpace = 0;
}
}

#include "moc_selectdestination.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mytharchive/mytharchive/themeselector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -252,3 +252,5 @@ void DVDThemeSelector::saveConfiguration(void)
theme = theme.replace(QString(" "), QString("_"));
gCoreContext->SaveSetting("MythBurnMenuTheme", theme);
}

#include "moc_themeselector.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mytharchive/mytharchive/thumbfinder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -956,3 +956,5 @@ int ThumbFinder::calcFinalDuration()

return m_archiveItem->duration;
}

#include "moc_thumbfinder.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mytharchive/mytharchive/videoselector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -556,3 +556,5 @@ void VideoSelector::parentalLevelChanged(bool passwordValid, ParentalLevel::Leve
}
}


#include "moc_videoselector.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythbrowser/mythbrowser/bookmarkeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,5 @@ void BookmarkEditor::slotCategoryFound(const QString& category)
{
m_categoryEdit->SetText(category);
}

#include "moc_bookmarkeditor.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -659,3 +659,5 @@ void BookmarkManager::slotClearMarked(void)
}
}
}

#include "moc_bookmarkmanager.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -405,3 +405,5 @@ bool MythBrowser::keyPressEvent(QKeyEvent *event)
}



#include "moc_mythbrowser.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythbrowser/mythbrowser/mythflashplayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,5 @@ bool MythFlashPlayer::keyPressEvent(QKeyEvent *event)

return handled;
}

#include "moc_mythflashplayer.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythbrowser/mythbrowser/webpage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,5 @@ void WebPage::slotTitleChanged(const QString &title)
m_listItem->SetText(title);
m_parent->m_pageList->Update();
}

#include "moc_webpage.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythgame/mythgame/gamedetails.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,5 @@ void GameDetailsPopup::SetReturnEvent(QObject *retobject,
m_id = resultid;
}


#include "moc_gamedetails.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythgame/mythgame/gamehandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1013,3 +1013,5 @@ void GameHandler::CreateProgress(const QString& message)
m_progressDlg = nullptr;
}
}

#include "moc_gamehandler.cpp"
2 changes: 1 addition & 1 deletion mythplugins/mythgame/mythgame/gamescan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -256,4 +256,4 @@ void GameScanner::finishedScan()
emit finished(m_scanThread->getDataChanged());
}

////////////////////////////////////////////////////////////////////////
#include "moc_gamescan.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythgame/mythgame/gamesettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -430,3 +430,5 @@ void GamePlayersList::CreateNewPlayer(const QString& name)
// Redraw list
setVisible(true);
}

#include "moc_gamesettings.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythgame/mythgame/gameui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1111,3 +1111,5 @@ void GameUI::reloadAllData(bool dbChanged)
BuildTree();
}


#include "moc_gameui.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythgame/mythgame/romedit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,5 @@ void EditRomInfoDialog::SetBoxart(const QString& file)
m_workingRomInfo->setBoxart(file);
m_boxartText->SetText(file);
}

#include "moc_romedit.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/avfdecoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -628,3 +628,5 @@ Decoder *avfDecoderFactory::create(const QString &file, AudioOutput *output, boo

return s_decoder;
}

#include "moc_avfdecoder.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/cdrip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1631,3 +1631,5 @@ void RipStatus::startRip(void)
m_ripperThread = new CDRipperThread(this, m_cdDevice, m_tracks, m_quality);
m_ripperThread->start();
}

#include "moc_cdrip.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/decoderhandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -381,3 +381,5 @@ void DecoderHandler::doOperationStop(void)
DecoderHandlerEvent ev(DecoderHandlerEvent::kOperationStop);
dispatch(ev);
}

#include "moc_decoderhandler.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/editmetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1376,3 +1376,5 @@ void EditAlbumartDialog::removeCachedImage(const AlbumArtImage *image)

GetMythUI()->RemoveFromCacheByFile(image->m_filename);
}

#include "moc_editmetadata.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/generalsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,5 @@ void GeneralSettings::slotSave(void)

Close();
}

#include "moc_generalsettings.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/importmusic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1144,3 +1144,5 @@ void ImportCoverArtDialog::updateTypeSelector()
else
m_typeList->SetValue(tr("<Unknown>"));
}

#include "moc_importmusic.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/importsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,5 @@ void ImportSettings::slotSave(void)

Close();
}

#include "moc_importsettings.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/lyricsview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -662,3 +662,5 @@ void EditLyricsDialog::cancelPressed(void )
emit haveResult(false);
Close();
}

#include "moc_lyricsview.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/mainvisual.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -281,3 +281,5 @@ void MainVisual::customEvent(QEvent *event)
m_playing = false;
}
}

#include "moc_mainvisual.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/miniplayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,5 @@ bool MiniPlayer::keyPressEvent(QKeyEvent *event)

return handled;
}

#include "moc_miniplayer.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/musiccommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2931,3 +2931,5 @@ bool TrackInfoDialog::keyPressEvent(QKeyEvent *event)

return handled;
}

#include "moc_musiccommon.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/musicdata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,5 @@ void MusicData::loadMusic(void) const
if (busy)
busy->Close();
}

#include "moc_musicdata.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/musicplayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1679,3 +1679,5 @@ void MusicPlayer::sendNotification(int notificationID, const QString &title, con
GetNotificationCenter()->Queue(*n);
delete n;
}

#include "moc_musicplayer.cpp"
1 change: 1 addition & 0 deletions mythplugins/mythmusic/mythmusic/playersettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,4 @@ void PlayerSettings::slotSave(void)
Close();
}

#include "moc_playersettings.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/playlist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1463,3 +1463,5 @@ int Playlist::CreateCDAudio(void)
return -1;
}
#endif

#include "moc_playlist.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1806,3 +1806,5 @@ void PlaylistEditorView::deletePlaylist(bool ok)
}
}
}

#include "moc_playlisteditorview.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/playlistview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,5 @@ bool PlaylistView::keyPressEvent(QKeyEvent *event)

return handled;
}

#include "moc_playlistview.cpp"
2 changes: 1 addition & 1 deletion mythplugins/mythmusic/mythmusic/ratingsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ void RatingSettings::slotSave(void)
Close();
}


#include "moc_ratingsettings.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/searchview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -495,3 +495,5 @@ void SearchView::trackVisible(MythUIButtonListItem *item)
}
}
}

#include "moc_searchview.cpp"
1 change: 1 addition & 0 deletions mythplugins/mythmusic/mythmusic/smartplaylist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2192,3 +2192,4 @@ void SmartPLDateDialog::valueChanged(void)
m_okButton->SetEnabled(bValidDate);
}

#include "moc_smartplaylist.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/streamview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1161,3 +1161,5 @@ void SearchStream::doUpdateStreams(void)

m_updating = false;
}

#include "moc_streamview.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/visualizationsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,5 @@ void VisualizationSettings::slotSave(void)

Close();
}

#include "moc_visualizationsettings.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythmusic/mythmusic/visualizerview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,5 @@ bool TrackInfoPopup::keyPressEvent(QKeyEvent *event)

return handled;
}

#include "moc_visualizerview.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnetvision/mythnetvision/netbase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -326,3 +326,5 @@ void NetBase::DoPlayVideo(void)

DoPlayVideo(filename);
}

#include "moc_netbase.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnetvision/mythnetvision/neteditorbase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -244,3 +244,5 @@ void NetEditorBase::ToggleItem(MythUIButtonListItem *item)
item->setChecked(MythUIButtonListItem::NotChecked);
}
}

#include "moc_neteditorbase.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnetvision/mythnetvision/netsearch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -585,3 +585,5 @@ void NetSearch::customEvent(QEvent *event)
NetBase::customEvent(event);
}
}

#include "moc_netsearch.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnetvision/mythnetvision/nettree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -996,3 +996,5 @@ void NetTree::SetSubfolderData(MythGenericTree *folder)
"childcount");
folder->DisplayState("subfolder", "nodetype");
}

#include "moc_nettree.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnetvision/mythnetvision/rsseditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -557,3 +557,5 @@ void RSSEditor::ListChanged()
m_changed = true;
LoadData();
}

#include "moc_rsseditor.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnetvision/mythnetvision/searcheditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ bool SearchEditor::Matches(bool search, bool /*tree*/)
{
return search;
}

#include "moc_searcheditor.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnetvision/mythnetvision/treeeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ bool TreeEditor::Matches(bool /*search*/, bool tree)
{
return tree;
}

#include "moc_treeeditor.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnews/mythnews/mythnews.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -734,3 +734,5 @@ QString MythNews::cleanText(const QString &text)

return result;
}

#include "moc_mythnews.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnews/mythnews/mythnewsconfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -244,3 +244,5 @@ bool MythNewsConfig::keyPressEvent(QKeyEvent *event)

return handled;
}

#include "moc_mythnewsconfig.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnews/mythnews/mythnewseditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,5 @@ void MythNewsEditor::Save(void)
}
Close();
}

#include "moc_mythnewseditor.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythnews/mythnews/newssite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -518,3 +518,5 @@ QString NewsSite::ReplaceHtmlChar(const QString &orig)

return s;
}

#include "moc_newssite.cpp"
2 changes: 2 additions & 0 deletions mythplugins/mythweather/mythweather/sourceManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -379,3 +379,5 @@ void SourceManager::recurseDirs( QDir dir )
}
}
}

#include "moc_sourceManager.cpp"
4 changes: 1 addition & 3 deletions mythplugins/mythweather/mythweather/weather.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,4 @@ void Weather::nextpage_timeout()
m_nextPageTimer->start(m_nextpageInterval);
}

/*
* vim:ts=4:sw=4:ai:et:si:sts=4
*/
#include "moc_weather.cpp"
Loading
Loading