Ticket #8088: 8088_playgroups_v18.2.patch
File 8088_playgroups_v18.2.patch, 112.7 KB (added by , 15 years ago) |
---|
-
libs/libmythtv/videoout_vdpau.h
20 20 { 21 21 public: 22 22 static void GetRenderOptions(render_opts &opts); 23 VideoOutputVDPAU( );23 VideoOutputVDPAU(PlaySettings *settings); 24 24 ~VideoOutputVDPAU(); 25 25 bool Init(int width, int height, float aspect, WId winid, 26 26 int winx, int winy, int winw, int winh, … … 54 54 const QSize &video_dim); 55 55 static MythCodecID GetBestSupportedCodec(uint width, uint height, 56 56 uint stream_type, 57 bool no_acceleration); 57 bool no_acceleration, 58 PlaySettings *settings); 58 59 virtual bool IsPIPSupported(void) const { return true; } 59 60 virtual bool IsPBPSupported(void) const { return false; } 60 61 virtual bool NeedExtraAudioDecode(void) const -
libs/libmythtv/subtitlereader.h
33 33 34 34 TextSubtitles* GetTextSubtitles(void) { return &m_TextSubtitles; } 35 35 bool HasTextSubtitles(void); 36 bool LoadExternalSubtitles(const QString &videoFile );36 bool LoadExternalSubtitles(const QString &videoFile, PlaySettings *settings); 37 37 38 38 private: 39 39 AVSubtitles m_AVSubtitles; -
libs/libmythtv/videooutwindow.cpp
29 29 30 30 #include "videooutwindow.h" 31 31 #include "osd.h" 32 #include "playsettings.h" 32 33 #include "mythplayer.h" 33 34 #include "videodisplayprofile.h" 34 35 #include "decoderbase.h" … … 53 54 const float VideoOutWindow::kManualZoomMinVerticalZoom = 0.5f; 54 55 const int VideoOutWindow::kManualZoomMaxMove = 50; 55 56 56 VideoOutWindow::VideoOutWindow( ) :57 VideoOutWindow::VideoOutWindow(PlaySettings *_settings) : 57 58 // DB settings 58 59 db_move(0, 0), db_scale_horiz(0.0f), db_scale_vert(0.0f), 59 60 db_pip_size(26), … … 84 85 85 86 // Various state variables 86 87 embedding(false), needrepaint(false), 87 allowpreviewepg(true), pip_state(kPIPOff) 88 allowpreviewepg(true), pip_state(kPIPOff), 89 90 settings(_settings) 88 91 { 89 92 db_pip_size = gCoreContext->GetNumSetting("PIPSize", 26); 90 93 91 db_move = QPoint( gCoreContext->GetNumSetting("xScanDisplacement", 0),92 gCoreContext->GetNumSetting("yScanDisplacement", 0));94 db_move = QPoint(settings->GetNumSetting("xScanDisplacement", 0), 95 settings->GetNumSetting("yScanDisplacement", 0)); 93 96 db_use_gui_size = gCoreContext->GetNumSetting("GuiSizeForTV", 0); 94 97 95 98 QDesktopWidget *desktop = NULL; … … 612 615 if (change) 613 616 { 614 617 db_scale_vert = 615 gCoreContext->GetNumSetting("VertScanPercentage", 0) * 0.01f;618 settings->GetNumSetting("VertScanPercentage", 0) * 0.01f; 616 619 db_scale_horiz = 617 gCoreContext->GetNumSetting("HorizScanPercentage", 0) * 0.01f;620 settings->GetNumSetting("HorizScanPercentage", 0) * 0.01f; 618 621 db_scaling_allowed = true; 619 622 } 620 623 else -
libs/libmythtv/videoout_d3d.cpp
50 50 opts.priorities->insert("direct3d", 55); 51 51 } 52 52 53 VideoOutputD3D::VideoOutputD3D( void)54 : VideoOutput( ),m_lock(QMutex::Recursive),53 VideoOutputD3D::VideoOutputD3D(PlaySettigns *settings) 54 : VideoOutput(settings), m_lock(QMutex::Recursive), 55 55 m_hWnd(NULL), m_render(NULL), 56 56 m_video(NULL), 57 57 m_render_valid(false), m_render_reset(false), m_pip_active(NULL), -
libs/libmythtv/DetectLetterbox.cpp
5 5 #include "mythplayer.h" 6 6 #include "videoouttypes.h" 7 7 #include "mythcorecontext.h" 8 #include "playsettings.h" 8 9 9 10 DetectLetterbox::DetectLetterbox(MythPlayer* const player) 10 11 { 11 int dbAdjustFill = gCoreContext->GetNumSetting("AdjustFill", 0);12 int dbAdjustFill = player->GetPlaySettings()->GetNumSetting("AdjustFill", 0); 12 13 isDetectLetterbox = dbAdjustFill >= kAdjustFill_AutoDetect_DefaultOff; 13 14 firstFrameChecked = 0; 14 15 detectLetterboxDefaultMode = (AdjustFillMode) max((int) kAdjustFill_Off, … … 18 19 detectLetterboxPossibleFullFrame = -1; 19 20 detectLetterboxConsecutiveCounter = 0; 20 21 detectLetterboxDetectedMode = player->GetAdjustFill(); 21 detectLetterboxLimit = gCoreContext->GetNumSetting("DetectLeterboxLimit", 75); 22 detectLetterboxLimit = 23 player->GetPlaySettings()->GetNumSetting("DetectLeterboxLimit", 75); 22 24 m_player = player; 23 25 } 24 26 -
libs/libmythtv/videoout_opengl.cpp
37 37 opts.priorities->insert("opengl", 65); 38 38 } 39 39 40 VideoOutputOpenGL::VideoOutputOpenGL( )41 : VideoOutput( ),40 VideoOutputOpenGL::VideoOutputOpenGL(PlaySettings *settings) 41 : VideoOutput(settings), 42 42 gl_context_lock(QMutex::Recursive), 43 43 gl_context(NULL), gl_videochain(NULL), gl_pipchain_active(NULL), 44 44 gl_parent_win(0), gl_embed_win(0), gl_painter(NULL) -
libs/libmythtv/videoout_quartz.cpp
63 63 #include "mythverbose.h" 64 64 #include "videodisplayprofile.h" 65 65 66 class PlaySettings; 67 66 68 #define LOC QString("VideoOutputQuartz::") 67 69 #define LOC_ERR QString("VideoOutputQuartz Error: ") 68 70 … … 1104 1106 /** \class VideoOutputQuartz 1105 1107 * \brief Implementation of Quartz (Mac OS X windowing system) video output 1106 1108 */ 1107 VideoOutputQuartz::VideoOutputQuartz( ) :1108 VideoOutput( ), Started(false), data(new QuartzData())1109 VideoOutputQuartz::VideoOutputQuartz(PlaySettings *settings) : 1110 VideoOutput(settings), Started(false), data(new QuartzData()) 1109 1111 { 1110 1112 init(&pauseFrame, FMT_YV12, NULL, 0, 0, 0, 0); 1111 1113 } … … 1755 1757 MythCodecID VideoOutputQuartz::GetBestSupportedCodec( 1756 1758 uint width, uint height, 1757 1759 uint osd_width, uint osd_height, 1758 uint stream_type, uint fourcc )1760 uint stream_type, uint fourcc, PlaySettings *settings) 1759 1761 { 1760 1762 (void) osd_width; 1761 1763 (void) osd_height; 1762 1764 1763 VideoDisplayProfile vdp ;1765 VideoDisplayProfile vdp(settings); 1764 1766 vdp.SetInput(QSize(width, height)); 1765 1767 QString dec = vdp.GetDecoder(); 1766 1768 if ((dec == "libmpeg2") || (dec == "ffmpeg")) -
libs/libmythtv/avformatdecoder.cpp
31 31 #include "BDRingBuffer.h" 32 32 #include "videodisplayprofile.h" 33 33 #include "mythuihelper.h" 34 #include "playsettings.h" 34 35 35 36 #include "lcddevice.h" 36 37 … … 301 302 302 303 cc608_build_parity_table(cc608_parity_table); 303 304 304 if ( gCoreContext->GetNumSetting("CCBackground", 0))305 if (GetPlayer()->GetPlaySettings()->GetNumSetting("CCBackground", 0)) 305 306 CC708Window::forceWhiteOnBlackText = true; 306 307 307 308 no_dts_hack = false; … … 1188 1189 if (selectedStream) 1189 1190 { 1190 1191 directrendering = true; 1191 if (! gCoreContext->GetNumSetting("DecodeExtraAudio", 0) &&1192 if (!GetPlayer()->GetPlaySettings()->GetNumSetting("DecodeExtraAudio", 0) && 1192 1193 !CODEC_IS_HWACCEL(codec)) 1193 1194 { 1194 1195 SetLowBuffers(false); … … 1705 1706 1706 1707 if (!is_db_ignored) 1707 1708 { 1708 VideoDisplayProfile vdp ;1709 VideoDisplayProfile vdp(GetPlayer()->GetPlaySettings()); 1709 1710 vdp.SetInput(QSize(width, height)); 1710 1711 dec = vdp.GetDecoder(); 1711 1712 thread_count = vdp.GetMaxCPUs(); … … 1733 1734 MythCodecID vdpau_mcid; 1734 1735 vdpau_mcid = VideoOutputVDPAU::GetBestSupportedCodec( 1735 1736 width, height, 1736 mpeg_version(enc->codec_id), no_hardware_decoders); 1737 mpeg_version(enc->codec_id), no_hardware_decoders, 1738 GetPlayer()->GetPlaySettings()); 1737 1739 1738 1740 if (vdpau_mcid >= video_codec_id) 1739 1741 { … … 1765 1767 /* mpeg type */ mpeg_version(enc->codec_id), 1766 1768 /* xvmc pix fmt */ xvmc_pixel_format(enc->pix_fmt), 1767 1769 /* test surface */ codec_is_std(video_codec_id), 1768 /* force_xv */ force_xv); 1770 /* force_xv */ force_xv, 1771 GetPlayer()->GetPlaySettings()); 1769 1772 1770 1773 if (mcid >= video_codec_id) 1771 1774 { -
libs/libmythtv/playgroup.cpp
1 1 #include "mythdb.h" 2 2 #include "playgroup.h" 3 3 #include "programinfo.h" 4 #include "playsettings.h" 4 5 5 6 // A parameter associated with the profile itself 6 7 class PlayGroupDBStorage : public SimpleDBStorage … … 210 211 return res; 211 212 } 212 213 213 PlayGroupEditor::PlayGroupEditor(void) : 214 listbox(new ListBoxSetting(this)), lastValue("Default") 214 PlayGroupEditor::PlayGroupEditor(SettingsLookup *funcArray, int funcArraySize) : 215 listbox(new ListBoxSetting(this)), lastValue("Default"), 216 getSettings(funcArray), getSettingsSize(funcArraySize) 215 217 { 216 218 listbox->setLabel(tr("Playback Groups")); 217 219 addChild(listbox); … … 242 244 } 243 245 244 246 PlayGroup group(name); 247 PlaySettings *psettings = new PlaySettings(name); 248 for (int i=0; i<getSettingsSize; i++) 249 getSettings[i](psettings, &group); 245 250 if (group.exec() == QDialog::Accepted || !created) 246 251 lastValue = name; 247 252 else … … 276 281 query.bindValue(":NAME", name); 277 282 if (!query.exec()) 278 283 MythDB::DBError("PlayGroupEditor::doDelete", query); 284 PlaySettings::deleteGroup(name); 279 285 280 286 int lastIndex = listbox->getValueIndex(name); 281 287 lastValue = ""; -
libs/libmythtv/videoout_opengl.h
10 10 { 11 11 public: 12 12 static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); 13 VideoOutputOpenGL( );13 VideoOutputOpenGL(PlaySettings *settings); 14 14 ~VideoOutputOpenGL(); 15 15 16 16 bool Init(int width, int height, float aspect, WId winid, -
libs/libmythtv/tv_play.h
56 56 class OSDListTreeItemEnteredEvent; 57 57 class OSDListTreeItemSelectedEvent; 58 58 struct osdInfo; 59 class PlaySettings; 59 60 60 61 typedef QMap<QString,InfoMap> DDValueMap; 61 62 typedef QMap<QString,DDValueMap> DDKeyMap; … … 179 180 unsigned long seconds; 180 181 }; 181 182 182 TV( void);183 TV(PlaySettings *settings); 183 184 ~TV(); 184 185 185 void InitFromDB( void);186 void InitFromDB(PlaySettings *settings); 186 187 bool Init(bool createWindow = true); 187 188 188 189 // User input processing commands … … 205 206 206 207 // Recording commands 207 208 int PlayFromRecorder(int recordernum); 208 int Playback(const ProgramInfo &rcinfo );209 int Playback(const ProgramInfo &rcinfo, PlaySettings *settings); 209 210 210 211 // Commands used by frontend playback box 211 212 QString GetRecordingGroup(int player_idx) const; -
libs/libmythtv/playgroup.h
7 7 #include "mythwidgets.h" 8 8 9 9 class ProgramInfo; 10 class PlaySettings; 10 11 11 12 class MPUBLIC PlayGroup: public ConfigurationWizard 12 13 { … … 29 30 Q_OBJECT 30 31 31 32 public: 32 PlayGroupEditor(void); 33 typedef ConfigurationWizard *(*SettingsLookup)(PlaySettings *settings, 34 ConfigurationWizard *base); 35 PlayGroupEditor(SettingsLookup *funcArray, int funcArraySize); 33 36 virtual DialogCode exec(void); 34 37 virtual void Load(void); 35 38 virtual void Save(void) { } … … 44 47 protected: 45 48 ListBoxSetting *listbox; 46 49 QString lastValue; 50 SettingsLookup *getSettings; 51 int getSettingsSize; 47 52 }; 48 53 49 54 #endif -
libs/libmythtv/dbcheck.cpp
3556 3556 3557 3557 VideoDisplayProfile::CreateNewProfiles(host); 3558 3558 profiles = VideoDisplayProfile::GetProfiles(host); 3559 QString profile = VideoDisplayProfile::GetDefaultProfileName(host); 3559 QString profile = 3560 VideoDisplayProfile::GetDefaultProfileName(host, NULL); 3560 3561 3561 3562 if (profiles.contains("Normal") && 3562 3563 (profile=="CPU++" || profile=="CPU+" || profile=="CPU--")) … … 5948 5949 " jump int(11) NOT NULL default '0'," 5949 5950 " PRIMARY KEY (`name`)" 5950 5951 ");", 5952 "CREATE TABLE playgroupsettings (" 5953 " playgroupname varchar(64) NOT NULL," 5954 " `value` varchar(128) NOT NULL," 5955 " `data` text," 5956 " overridden tinyint(1) NOT NULL," 5957 " PRIMARY KEY (playgroupname, `value`)" 5958 ");", 5951 5959 "CREATE TABLE powerpriority (" 5952 5960 " priorityname varchar(64) collate utf8_bin NOT NULL," 5953 5961 " recpriority int(10) NOT NULL default '0'," -
libs/libmythtv/videoout_vdpau.cpp
48 48 opts.deints->insert("vdpau", deints); 49 49 } 50 50 51 VideoOutputVDPAU::VideoOutputVDPAU( )52 : m_win(0),m_render(NULL),51 VideoOutputVDPAU::VideoOutputVDPAU(PlaySettings *settings) 52 : VideoOutput(settings), m_win(0), m_render(NULL), 53 53 m_buffer_size(NUM_VDPAU_BUFFERS), m_pause_surface(0), 54 54 m_need_deintrefs(false), m_video_mixer(0), m_mixer_features(kVDPFeatNone), 55 55 m_checked_surface_ownership(false), … … 877 877 878 878 MythCodecID VideoOutputVDPAU::GetBestSupportedCodec( 879 879 uint width, uint height, 880 uint stream_type, bool no_acceleration )880 uint stream_type, bool no_acceleration, PlaySettings *settings) 881 881 { 882 882 bool use_cpu = no_acceleration; 883 VideoDisplayProfile vdp ;883 VideoDisplayProfile vdp(settings); 884 884 vdp.SetInput(QSize(width, height)); 885 885 QString dec = vdp.GetDecoder(); 886 886 -
libs/libmythtv/videoout_directfb.cpp
274 274 opts.priorities->insert("directfb", 60); 275 275 } 276 276 277 VideoOutputDirectfb::VideoOutputDirectfb( )278 : VideoOutput( ), XJ_started(false), widget(NULL),277 VideoOutputDirectfb::VideoOutputDirectfb(PlaySettings *settings) 278 : VideoOutput(settings), XJ_started(false), widget(NULL), 279 279 data(new DirectfbData()) 280 280 { 281 281 init(&pauseFrame, FMT_YV12, NULL, 0, 0, 0, 0); -
libs/libmythtv/mythplayer.h
213 213 QString GetXDS(const QString &key) const; 214 214 PIPLocation GetNextPIPLocation(void) const; 215 215 216 PlaySettings *GetPlaySettings(void) const { 217 return player_ctx ? player_ctx->settings : NULL; 218 } 219 216 220 // Bool Gets 217 221 bool GetRawAudioState(void) const; 218 222 bool GetLimitKeyRepeat(void) const { return limitKeyRepeat; } -
libs/libmythtv/videoout_d3d.h
12 12 { 13 13 public: 14 14 static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); 15 VideoOutputD3D( );15 VideoOutputD3D(PlaySettings *settings); 16 16 ~VideoOutputD3D(); 17 17 18 18 bool Init(int width, int height, float aspect, WId winid, -
libs/libmythtv/playercontext.cpp
16 16 #include "storagegroup.h" 17 17 #include "mythcorecontext.h" 18 18 #include "videometadatautil.h" 19 #include "DetectLetterbox.h" 20 #include "playsettings.h" 19 21 20 22 #define LOC QString("playCtx: ") 21 23 #define LOC_ERR QString("playCtx, Error: ") … … 405 407 WId embedwinid, const QRect *embedbounds, 406 408 bool muted) 407 409 { 408 int exact_seeking = gCoreContext->GetNumSetting("ExactSeeking", 0);410 int exact_seeking = settings->GetNumSetting("ExactSeeking", 0); 409 411 410 412 if (HasPlayer()) 411 413 { … … 448 450 { 449 451 QString subfn = buffer->GetSubtitleFilename(); 450 452 if (!subfn.isEmpty() && player->GetSubReader()) 451 player->GetSubReader()->LoadExternalSubtitles(subfn );453 player->GetSubReader()->LoadExternalSubtitles(subfn, settings); 452 454 } 453 455 454 456 if ((embedwinid > 0) && embedbounds) … … 893 895 /** 894 896 * \brief assign programinfo to the context 895 897 */ 896 void PlayerContext::SetPlayingInfo(const ProgramInfo *info) 898 void PlayerContext::SetPlayingInfo(const ProgramInfo *info, 899 PlaySettings *_settings) 897 900 { 898 901 bool ignoreDB = gCoreContext->IsDatabaseIgnored(); 899 902 … … 905 908 playingInfo->MarkAsInUse(false, recUsage); 906 909 delete playingInfo; 907 910 playingInfo = NULL; 911 // XXX delete settings? 908 912 } 909 913 910 914 if (info) … … 913 917 if (!ignoreDB) 914 918 playingInfo->MarkAsInUse(true, recUsage); 915 919 playingLen = playingInfo->GetSecondsInRecording(); 920 settings = (_settings ? _settings : 921 new PlaySettings(playingInfo->GetPlaybackGroup())); 916 922 } 917 923 } 918 924 -
libs/libmythtv/subtitlereader.cpp
56 56 av_free(subtitle.rects); 57 57 } 58 58 59 bool SubtitleReader::LoadExternalSubtitles(const QString &subtitleFileName) 59 bool SubtitleReader::LoadExternalSubtitles(const QString &subtitleFileName, 60 PlaySettings *settings) 60 61 { 61 62 m_TextSubtitles.Clear(); 62 return TextSubtitleParser::LoadSubtitles(subtitleFileName, m_TextSubtitles); 63 return TextSubtitleParser::LoadSubtitles(subtitleFileName, m_TextSubtitles, 64 settings); 63 65 } 64 66 65 67 bool SubtitleReader::HasTextSubtitles(void) -
libs/libmythtv/textsubtitleparser.h
17 17 // Qt headers 18 18 #include <QStringList> 19 19 20 class PlaySettings; 21 20 22 class text_subtitle_t 21 23 { 22 24 public: … … 79 81 class TextSubtitleParser 80 82 { 81 83 public: 82 static bool LoadSubtitles(QString fileName, TextSubtitles &target); 84 static bool LoadSubtitles(QString fileName, TextSubtitles &target, 85 PlaySettings *settings); 83 86 }; 84 87 85 88 #endif -
libs/libmythtv/vsync.cpp
34 34 35 35 #include "mythcontext.h" 36 36 #include "mythmainwindow.h" 37 #include "playsettings.h" 37 38 38 39 #ifdef USING_XV 39 40 #include "videoout_xv.h" … … 78 79 * \brief Returns the most sophisticated video sync method available. 79 80 */ 80 81 VideoSync *VideoSync::BestMethod(VideoOutput *video_output, 82 PlaySettings *settings, 81 83 uint frame_interval, uint refresh_interval, 82 84 bool halve_frame_interval) 83 85 { … … 102 104 #ifndef _WIN32 103 105 TESTVIDEOSYNC(DRMVideoSync); 104 106 #ifdef USING_OPENGL_VSYNC 105 if ( gCoreContext->GetNumSetting("UseOpenGLVSync", 1) &&107 if (settings->GetNumSetting("UseOpenGLVSync", 1) && 106 108 (getenv("NO_OPENGL_VSYNC") == NULL)) 107 109 { 108 110 TESTVIDEOSYNC(OpenGLVideoSync); -
libs/libmythtv/tv_play.cpp
56 56 #include "mythsystemevent.h" 57 57 #include "videometadatautil.h" 58 58 #include "mythdialogbox.h" 59 #include "playsettings.h" 59 60 60 61 #if ! HAVE_ROUND 61 62 #define round(x) ((int) ((x) + 0.5)) … … 206 207 bool startInGuide = flags & kStartTVInGuide; 207 208 bool inPlaylist = flags & kStartTVInPlayList; 208 209 bool initByNetworkCommand = flags & kStartTVByNetworkCommand; 209 TV *tv = new TV();210 210 bool quitAll = false; 211 211 bool showDialogs = true; 212 212 bool playCompleted = false; … … 220 220 curProgram->SetIgnoreBookmark(flags & kStartTVIgnoreBookmark); 221 221 } 222 222 223 PlaySettings settings(curProgram ? curProgram->GetPlaybackGroup() : "Default"); 224 TV *tv = new TV(&settings); 225 223 226 // Initialize TV 224 227 if (!tv->Init()) 225 228 { … … 250 253 if (curProgram) 251 254 { 252 255 VERBOSE(VB_PLAYBACK, LOC + "tv->Playback() -- begin"); 253 if (!tv->Playback(*curProgram ))256 if (!tv->Playback(*curProgram, &settings)) 254 257 { 255 258 quitAll = true; 256 259 } … … 831 834 class TVInitRunnable : public QRunnable 832 835 { 833 836 public: 834 TVInitRunnable(TV *ourTV) : tv(ourTV) {} 835 virtual void run(void) { tv->InitFromDB(); } 837 TVInitRunnable(TV *ourTV, PlaySettings *ourSettings) : 838 tv(ourTV), settings(ourSettings) {} 839 virtual void run(void) { tv->InitFromDB(settings); } 836 840 TV *tv; 841 PlaySettings *settings; 837 842 }; 838 843 839 844 /** \fn TV::TV(void) 840 845 * \sa Init(void) 841 846 */ 842 TV::TV( void)847 TV::TV(PlaySettings *settings) 843 848 : // Configuration variables from database 844 849 baseFilters(""), 845 850 db_channel_format("<num> <sign>"), … … 938 943 playerActive = 0; 939 944 playerLock.unlock(); 940 945 941 QThreadPool::globalInstance()->start(new TVInitRunnable(this ), 99);946 QThreadPool::globalInstance()->start(new TVInitRunnable(this, settings), 99); 942 947 943 948 VERBOSE(VB_PLAYBACK, LOC + "ctor -- end"); 944 949 } 945 950 946 void TV::InitFromDB( void)951 void TV::InitFromDB(PlaySettings *settings) 947 952 { 948 953 QMap<QString,QString> kv; 949 954 kv["LiveTVIdleTimeout"] = "0"; … … 988 993 kv[QString("FFRewSpeed%1").arg(i)] = QString::number(ff_rew_def[i]); 989 994 990 995 MythDB::getMythDB()->GetSettings(kv); 996 settings->AddToMap(kv); 991 997 992 998 // convert from minutes to ms. 993 999 db_idle_timeout = kv["LiveTVIdleTimeout"].toInt() * 60 * 1000; … … 1718 1724 askAllowLock.unlock(); 1719 1725 } 1720 1726 1721 int TV::Playback(const ProgramInfo &rcinfo )1727 int TV::Playback(const ProgramInfo &rcinfo, PlaySettings *settings) 1722 1728 { 1723 1729 wantsToQuit = false; 1724 1730 jumpToProgram = false; … … 1732 1738 return 0; 1733 1739 } 1734 1740 1735 mctx->SetPlayingInfo(&rcinfo );1741 mctx->SetPlayingInfo(&rcinfo, settings); 1736 1742 mctx->SetInitialTVState(false); 1737 1743 ScheduleStateChange(mctx); 1738 1744 … … 1815 1821 1816 1822 if (fileexists) 1817 1823 { 1818 Playback(pginfo); 1824 PlaySettings settings("Default"); 1825 Playback(pginfo, &settings); 1819 1826 retval = 1; 1820 1827 } 1821 1828 … … 2156 2163 QString msg = tr("%1 Settings") 2157 2164 .arg(tv_i18n(ctx->playingInfo->GetPlaybackGroup())); 2158 2165 ctx->UnlockPlayingInfo(__FILE__, __LINE__); 2159 if (count > 0) 2166 if (count > 0 && 2167 ctx->playingInfo->GetPlaybackGroup() != "Default" && 2168 ctx->playingInfo->GetPlaybackGroup() != "Videos") 2160 2169 SetOSDMessage(ctx, msg); 2161 2170 ITVRestart(ctx, false); 2162 2171 } -
libs/libmythtv/videodisplayprofile.h
13 13 14 14 #include "mythcontext.h" 15 15 16 class PlaySettings; 17 16 18 typedef QMap<QString,QString> pref_map_t; 17 19 typedef QMap<QString,QStringList> safe_map_t; 18 20 typedef QStringList safe_list_t; … … 80 82 class MPUBLIC VideoDisplayProfile 81 83 { 82 84 public: 83 VideoDisplayProfile( );85 VideoDisplayProfile(PlaySettings *settings); 84 86 ~VideoDisplayProfile(); 85 87 86 88 void SetInput(const QSize &size); … … 124 126 static QString GetDecoderName(const QString &decoder); 125 127 static QString GetDecoderHelp(QString decoder = QString::null); 126 128 127 static QString GetDefaultProfileName(const QString &hostname); 129 static QString GetDefaultProfileName(const QString &hostname, 130 PlaySettings *settings); 128 131 static void SetDefaultProfileName(const QString &profilename, 129 132 const QString &hostname); 130 133 static uint GetProfileGroupID(const QString &profilename, -
libs/libmythtv/videoout_null.cpp
27 27 opts.priorities->insert("null", 10); 28 28 } 29 29 30 VideoOutputNull::VideoOutputNull( ) :31 VideoOutput( ), global_lock(QMutex::Recursive)30 VideoOutputNull::VideoOutputNull(PlaySettings *settings) : 31 VideoOutput(settings), global_lock(QMutex::Recursive) 32 32 { 33 33 VERBOSE(VB_PLAYBACK, "VideoOutputNull()"); 34 34 memset(&av_pause_frame, 0, sizeof(av_pause_frame)); -
libs/libmythtv/videooutbase.cpp
7 7 #include "mythplayer.h" 8 8 #include "videodisplayprofile.h" 9 9 #include "decoderbase.h" 10 #include "playsettings.h" 10 11 11 12 #include "mythcorecontext.h" 12 13 #include "mythverbose.h" … … 109 110 PIPState pipState, 110 111 const QSize &video_dim, float video_aspect, 111 112 WId win_id, const QRect &display_rect, 112 float video_prate, WId embed_id) 113 float video_prate, WId embed_id, 114 PlaySettings *settings) 113 115 { 114 116 (void) codec_priv; 115 117 … … 154 156 QString renderer = QString::null; 155 157 if (renderers.size() > 0) 156 158 { 157 VideoDisplayProfile vprof ;159 VideoDisplayProfile vprof(settings); 158 160 vprof.SetInput(video_dim); 159 161 160 162 QString tmp = vprof.GetVideoRenderer(); … … 182 184 183 185 #ifdef USING_DIRECTFB 184 186 if (renderer == "directfb") 185 vo = new VideoOutputDirectfb( );187 vo = new VideoOutputDirectfb(settings); 186 188 #endif // USING_DIRECTFB 187 189 188 190 #ifdef USING_MINGW 189 191 if (renderer == "direct3d") 190 vo = new VideoOutputD3D( );192 vo = new VideoOutputD3D(settings); 191 193 #endif // USING_MINGW 192 194 193 195 #ifdef USING_QUARTZ_VIDEO 194 196 if (osxlist.contains(renderer)) 195 vo = new VideoOutputQuartz( );197 vo = new VideoOutputQuartz(settings); 196 198 #endif // Q_OS_MACX 197 199 198 200 #ifdef USING_OPENGL_VIDEO 199 201 if (renderer == "opengl") 200 vo = new VideoOutputOpenGL( );202 vo = new VideoOutputOpenGL(settings); 201 203 #endif // USING_OPENGL_VIDEO 202 204 203 205 #ifdef USING_VDPAU 204 206 if (renderer == "vdpau") 205 vo = new VideoOutputVDPAU( );207 vo = new VideoOutputVDPAU(settings); 206 208 #endif // USING_VDPAU 207 209 208 210 #ifdef USING_XV 209 211 if (xvlist.contains(renderer)) 210 vo = new VideoOutputXv( );212 vo = new VideoOutputXv(settings); 211 213 #endif // USING_XV 212 214 213 215 if (vo) … … 305 307 * \brief This constructor for VideoOutput must be followed by an 306 308 * Init(int,int,float,WId,int,int,int,int,WId) call. 307 309 */ 308 VideoOutput::VideoOutput( ) :310 VideoOutput::VideoOutput(PlaySettings *_settings) : 309 311 // DB Settings 312 window(_settings), 310 313 db_display_dim(0,0), 311 314 db_aspectoverride(kAspect_Off), db_adjustfill(kAdjustFill_Off), 312 315 db_letterbox_colour(kLetterBoxColour_Black), … … 345 348 monitor_sz(640,480), monitor_dim(400,300), 346 349 347 350 // OSD 348 osd_painter(NULL), osd_image(NULL) 351 osd_painter(NULL), osd_image(NULL), 352 settings(_settings) 349 353 350 354 { 351 355 bzero(&pip_tmp_image, sizeof(pip_tmp_image)); 352 db_display_dim = QSize( gCoreContext->GetNumSetting("DisplaySizeWidth", 0),353 gCoreContext->GetNumSetting("DisplaySizeHeight", 0));356 db_display_dim = QSize(settings->GetNumSetting("DisplaySizeWidth", 0), 357 settings->GetNumSetting("DisplaySizeHeight", 0)); 354 358 355 359 db_pict_attr[kPictureAttribute_Brightness] = 356 gCoreContext->GetNumSetting("PlaybackBrightness", 50);360 settings->GetNumSetting("PlaybackBrightness", 50); 357 361 db_pict_attr[kPictureAttribute_Contrast] = 358 gCoreContext->GetNumSetting("PlaybackContrast", 50);362 settings->GetNumSetting("PlaybackContrast", 50); 359 363 db_pict_attr[kPictureAttribute_Colour] = 360 gCoreContext->GetNumSetting("PlaybackColour", 50);364 settings->GetNumSetting("PlaybackColour", 50); 361 365 db_pict_attr[kPictureAttribute_Hue] = 362 gCoreContext->GetNumSetting("PlaybackHue", 0);366 settings->GetNumSetting("PlaybackHue", 0); 363 367 364 368 db_aspectoverride = (AspectOverrideMode) 365 gCoreContext->GetNumSetting("AspectOverride", 0);369 settings->GetNumSetting("AspectOverride", 0); 366 370 db_adjustfill = (AdjustFillMode) 367 gCoreContext->GetNumSetting("AdjustFill", 0);371 settings->GetNumSetting("AdjustFill", 0); 368 372 db_letterbox_colour = (LetterBoxColour) 369 gCoreContext->GetNumSetting("LetterboxColour", 0);373 settings->GetNumSetting("LetterboxColour", 0); 370 374 db_use_picture_controls = 371 gCoreContext->GetNumSetting("UseOutputPictureControls", 0);375 settings->GetNumSetting("UseOutputPictureControls", 0); 372 376 373 377 if (!gCoreContext->IsDatabaseIgnored()) 374 db_vdisp_profile = new VideoDisplayProfile( );378 db_vdisp_profile = new VideoDisplayProfile(settings); 375 379 } 376 380 377 381 /** … … 447 451 return QString::null; 448 452 } 449 453 450 bool VideoOutput::IsPreferredRenderer(QSize video_size )454 bool VideoOutput::IsPreferredRenderer(QSize video_size, PlaySettings *settings) 451 455 { 452 456 if (!db_vdisp_profile || (video_size == window.GetVideoDispDim())) 453 457 return true; 454 458 455 VideoDisplayProfile vdisp ;459 VideoDisplayProfile vdisp(settings); 456 460 vdisp.SetInput(video_size); 457 461 QString new_rend = vdisp.GetVideoRenderer(); 458 462 if (new_rend.isEmpty()) -
libs/libmythtv/videooutwindow.h
16 16 #include "videoouttypes.h" 17 17 18 18 class MythPlayer; 19 class PlaySettings; 19 20 20 21 class VideoOutWindow 21 22 { 22 23 public: 23 VideoOutWindow( );24 VideoOutWindow(PlaySettings *settings); 24 25 25 26 bool Init(const QSize &new_video_dim, float aspect, 26 27 const QRect &new_display_visible_rect, … … 162 163 bool allowpreviewepg; 163 164 PIPState pip_state; 164 165 166 PlaySettings *settings; 167 165 168 // Constants 166 169 static const float kManualZoomMaxHorizontalZoom; 167 170 static const float kManualZoomMaxVerticalZoom; -
libs/libmythtv/videoout_directfb.h
12 12 { 13 13 public: 14 14 static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); 15 VideoOutputDirectfb( );15 VideoOutputDirectfb(PlaySettings *settings); 16 16 ~VideoOutputDirectfb(); 17 17 18 18 bool Init(int width, int height, float aspect, WId winid, -
libs/libmythtv/playercontext.h
28 28 class LiveTVChain; 29 29 class MythDialog; 30 30 class QPainter; 31 class PlaySettings; 31 32 32 33 struct osdInfo 33 34 { … … 112 113 void SetRecorder(RemoteEncoder *rec); 113 114 void SetTVChain(LiveTVChain *chain); 114 115 void SetRingBuffer(RingBuffer *buf); 115 void SetPlayingInfo(const ProgramInfo *info );116 void SetPlayingInfo(const ProgramInfo *info, PlaySettings *settings=NULL); 116 117 void SetPlayGroup(const QString &group); 117 118 void SetPseudoLiveTV(const ProgramInfo *pi, PseudoState new_state); 118 119 void SetPIPLocation(int loc) { pipLocation = loc; } … … 170 171 LiveTVChain *tvchain; 171 172 RingBuffer *buffer; 172 173 ProgramInfo *playingInfo; ///< Currently playing info 174 PlaySettings *settings; // corresponding to playingInfo 173 175 long long playingLen; ///< Initial CalculateLength() 174 176 AVSpecialDecode specialDecode; 175 177 bool nohardwaredecoders; // < Disable use of VDPAU decoding -
libs/libmythtv/vsync.h
87 87 88 88 // documented in vsync.cpp 89 89 static VideoSync *BestMethod(VideoOutput*, 90 PlaySettings *settings, 90 91 uint frame_interval, uint refresh_interval, 91 92 bool interlaced); 92 93 protected: -
libs/libmythtv/videoout_xv.h
51 51 friend class XvMCOSD; 52 52 public: 53 53 static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); 54 VideoOutputXv( );54 VideoOutputXv(PlaySettings *settings); 55 55 ~VideoOutputXv(); 56 56 57 57 bool Init(int width, int height, float aspect, WId winid, … … 109 109 static MythCodecID GetBestSupportedCodec(uint width, uint height, 110 110 uint osd_width, uint osd_height, 111 111 uint stream_type, int xvmc_chroma, 112 bool test_surface, bool force_xv); 112 bool test_surface, bool force_xv, 113 PlaySettings *settings); 113 114 114 115 static int GrabSuitableXvPort(MythXDisplay* disp, Window root, 116 PlaySettings *settings, 115 117 MythCodecID type, 116 118 uint width, uint height, 117 119 bool &xvsetdefaults, -
libs/libmythtv/videoout_xv.cpp
165 165 * \see VideoOutput, VideoBuffers 166 166 * 167 167 */ 168 VideoOutputXv::VideoOutputXv( )169 : VideoOutput( ),168 VideoOutputXv::VideoOutputXv(PlaySettings *settings) 169 : VideoOutput(settings), 170 170 video_output_subtype(XVUnknown), 171 171 global_lock(QMutex::Recursive), 172 172 … … 390 390 * \return port number if it succeeds, else -1. 391 391 */ 392 392 int VideoOutputXv::GrabSuitableXvPort(MythXDisplay* disp, Window root, 393 PlaySettings *settings, 393 394 MythCodecID mcodecid, 394 395 uint width, uint height, 395 396 bool &xvsetdefaults, … … 474 475 } 475 476 476 477 // figure out if we want chromakeying.. 477 VideoDisplayProfile vdp ;478 VideoDisplayProfile vdp(settings); 478 479 vdp.SetInput(QSize(width, height)); 479 480 bool check_for_colorkey = (vdp.GetOSDRenderer() == "chromakey"); 480 481 … … 763 764 disp->StartLog(); 764 765 QString adaptor_name = QString::null; 765 766 const QSize video_dim = window.GetVideoDim(); 766 xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), video_codec_id,767 xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), settings, video_codec_id, 767 768 video_dim.width(), video_dim.height(), 768 769 xv_set_defaults, 769 770 xvmc_chroma, &xvmc_surf_info, &adaptor_name); … … 842 843 disp->StartLog(); 843 844 QString adaptor_name = QString::null; 844 845 const QSize video_dim = window.GetVideoDim(); 845 xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), kCodec_MPEG2,846 xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), settings, kCodec_MPEG2, 846 847 video_dim.width(), video_dim.height(), 847 848 xv_set_defaults, 0, NULL, &adaptor_name); 848 849 if (xv_port == -1) … … 996 997 uint width, uint height, 997 998 uint osd_width, uint osd_height, 998 999 uint stream_type, int xvmc_chroma, 999 bool test_surface, bool force_xv) 1000 bool test_surface, bool force_xv, 1001 PlaySettings *settings) 1000 1002 { 1001 1003 (void)width, (void)height, (void)osd_width, (void)osd_height; 1002 1004 (void)stream_type, (void)xvmc_chroma, (void)test_surface; … … 1007 1009 return ret; 1008 1010 1009 1011 #ifdef USING_XVMC 1010 VideoDisplayProfile vdp ;1012 VideoDisplayProfile vdp(settings); 1011 1013 vdp.SetInput(QSize(width, height)); 1012 1014 QString dec = vdp.GetDecoder(); 1013 1015 if ((dec == "libmpeg2") || (dec == "ffmpeg")) … … 1057 1059 1058 1060 ok = false; 1059 1061 bool dummy; 1060 int port = GrabSuitableXvPort(disp, disp->GetRoot(), ret, width, height, 1062 int port = GrabSuitableXvPort(disp, disp->GetRoot(), settings, 1063 ret, width, height, 1061 1064 dummy, xvmc_chroma, &info); 1062 1065 if (port >= 0) 1063 1066 { -
libs/libmythtv/mythplayer.cpp
61 61 #include "mythpainter.h" 62 62 #include "mythimage.h" 63 63 #include "mythuiimage.h" 64 #include "playsettings.h" 64 65 65 66 extern "C" { 66 67 #include "vbitext/vbi.h" … … 246 247 output_jmeter(NULL) 247 248 { 248 249 playerThread = QThread::currentThread(); 249 // Playback (output) zoom control250 detect_letter_box = new DetectLetterbox(this);251 250 252 vbimode = VBIMode::Parse(gCoreContext->GetSetting("VbiFormat"));253 decode_extra_audio = gCoreContext->GetNumSetting("DecodeExtraAudio", 0);254 itvEnabled = gCoreContext->GetNumSetting("EnableMHEG", 0);255 db_prefer708 = gCoreContext->GetNumSetting("Prefer708Captions", 1);256 257 251 bzero(&tc_lastval, sizeof(tc_lastval)); 258 252 bzero(&tc_wrap, sizeof(tc_wrap)); 259 253 … … 491 485 if (using_null_videoout && GetDecoder()) 492 486 { 493 487 MythCodecID codec = GetDecoder()->GetVideoCodecID(); 494 videoOutput = new VideoOutputNull( );488 videoOutput = new VideoOutputNull(GetPlaySettings()); 495 489 if (!videoOutput->Init(video_disp_dim.width(), video_disp_dim.height(), 496 490 video_aspect, 0, 0, 0, 0, 0, codec, 0)) 497 491 { … … 541 535 pipState, 542 536 video_disp_dim, video_aspect, 543 537 widget->winId(), display_rect, (video_frame_rate * play_speed), 544 0 /*embedid*/ );538 0 /*embedid*/, GetPlaySettings()); 545 539 } 546 540 547 541 if (videoOutput) … … 631 625 632 626 void MythPlayer::ReinitVideo(void) 633 627 { 634 if (!videoOutput->IsPreferredRenderer(video_disp_dim ))628 if (!videoOutput->IsPreferredRenderer(video_disp_dim, GetPlaySettings())) 635 629 { 636 630 VERBOSE(VB_PLAYBACK, LOC + QString("Need to switch video renderer.")); 637 631 SetErrored(QObject::tr("Need to switch video renderer.")); … … 1969 1963 } 1970 1964 #endif // USING_MHEG 1971 1965 1972 SetCaptionsEnabled(gCoreContext->GetNumSetting("DefaultCCMode"), false); 1966 SetCaptionsEnabled(GetPlaySettings()->GetNumSetting("DefaultCCMode", 0), 1967 false); 1973 1968 } 1974 1969 1975 1970 SetPlaying(true); … … 2015 2010 m_double_process = videoOutput->IsExtraProcessingRequired(); 2016 2011 2017 2012 videosync = VideoSync::BestMethod( 2018 videoOutput, fr_int, rf_int, m_double_framerate); 2013 videoOutput, GetPlaySettings(), 2014 fr_int, rf_int, m_double_framerate); 2019 2015 2020 2016 // Make sure video sync can do it 2021 2017 if (videosync != NULL && m_double_framerate) … … 2378 2374 if (bookmarkseek > 30) 2379 2375 { 2380 2376 DoFastForward(bookmarkseek, true, false); 2381 if ( gCoreContext->GetNumSetting("ClearSavedPosition", 1) &&2377 if (GetPlaySettings()->GetNumSetting("ClearSavedPosition", 1) && 2382 2378 !player_ctx->IsPIP()) 2383 2379 { 2384 2380 ClearBookmark(false); … … 2592 2588 { 2593 2589 if (jumpto == totalFrames) 2594 2590 { 2595 if (!( gCoreContext->GetNumSetting("EndOfRecordingExitPrompt") == 12591 if (!(GetPlaySettings()->GetNumSetting("EndOfRecordingExitPrompt", 0) == 1 2596 2592 && !player_ctx->IsPIP() && 2597 2593 player_ctx->GetState() == kState_WatchingPreRecorded)) 2598 2594 { … … 2859 2855 return kPIP_END; 2860 2856 2861 2857 if (pip_players.isEmpty()) 2862 return (PIPLocation)gCoreContext->GetNumSetting("PIPLocation", kPIPTopLeft); 2858 return (PIPLocation)GetPlaySettings()->GetNumSetting("PIPLocation", 2859 kPIPTopLeft); 2863 2860 2864 2861 // order of preference, could be stored in db if we want it configurable 2865 2862 PIPLocation ols[] = … … 3357 3354 exactseeks = frame_exact_seek; 3358 3355 player_ctx = ctx; 3359 3356 livetv = ctx->tvchain; 3357 3358 vbimode = VBIMode::Parse(GetPlaySettings()->GetSetting("VbiFormat", "")); 3359 3360 // Playback (output) zoom control 3361 detect_letter_box = new DetectLetterbox(this); 3362 3363 decode_extra_audio = GetPlaySettings()->GetNumSetting("DecodeExtraAudio", 0); 3364 itvEnabled = GetPlaySettings()->GetNumSetting("EnableMHEG", 0); 3365 db_prefer708 = GetPlaySettings()->GetNumSetting("Prefer708Captions", 1); 3360 3366 } 3361 3367 3362 3368 bool MythPlayer::EnableEdit(void) -
libs/libmythtv/videooutbase.h
32 32 class FilterChain; 33 33 class FilterManager; 34 34 class OpenGLContextGLX; 35 class PlaySettings; 35 36 36 37 typedef QMap<MythPlayer*,PIPLocation> PIPMap; 37 38 … … 52 53 PIPState pipState, 53 54 const QSize &video_dim, float video_aspect, 54 55 WId win_id, const QRect &display_rect, 55 float video_prate, WId embed_id); 56 float video_prate, WId embed_id, 57 PlaySettings *settings); 56 58 57 VideoOutput( );59 VideoOutput(PlaySettings *settings); 58 60 virtual ~VideoOutput(); 59 61 60 62 virtual bool Init(int width, int height, float aspect, … … 62 64 int winh, MythCodecID codec_id, WId embedid = 0); 63 65 virtual void InitOSD(OSD *osd); 64 66 virtual void SetVideoFrameRate(float); 65 virtual bool IsPreferredRenderer(QSize video_size );67 virtual bool IsPreferredRenderer(QSize video_size, PlaySettings *settings); 66 68 virtual bool SetDeinterlacingEnabled(bool); 67 69 virtual bool SetupDeinterlace(bool i, const QString& ovrf=""); 68 70 virtual void FallbackDeint(void); … … 338 340 // OSD painter and surface 339 341 MythYUVAPainter *osd_painter; 340 342 MythImage *osd_image; 343 344 PlaySettings *settings; 341 345 }; 342 346 343 347 #endif -
libs/libmythtv/textsubtitleparser.cpp
21 21 #include "RingBuffer.h" 22 22 #include "textsubtitleparser.h" 23 23 #include "xine_demux_sputext.h" 24 #include "playsettings.h" 24 25 25 26 bool operator<(const text_subtitle_t& left, 26 27 const text_subtitle_t& right) … … 116 117 m_lock.unlock(); 117 118 } 118 119 119 bool TextSubtitleParser::LoadSubtitles(QString fileName, TextSubtitles &target) 120 bool TextSubtitleParser::LoadSubtitles(QString fileName, TextSubtitles &target, 121 PlaySettings *settings) 120 122 { 121 123 demux_sputext_t sub_data; 122 124 sub_data.rbuffer = new RingBuffer(fileName, 0, false); … … 134 136 target.SetFrameBasedTiming(!sub_data.uses_time); 135 137 136 138 QTextCodec *textCodec = NULL; 137 QString codec = gCoreContext->GetSetting("SubtitleCodec", "");139 QString codec = settings->GetSetting("SubtitleCodec", ""); 138 140 if (!codec.isEmpty()) 139 141 textCodec = QTextCodec::codecForName(codec.toLatin1()); 140 142 if (!textCodec) -
libs/libmythtv/subtitlescreen.cpp
7 7 #include "mythuiimage.h" 8 8 #include "mythpainter.h" 9 9 #include "subtitlescreen.h" 10 #include "playsettings.h" 10 11 11 12 #define LOC QString("Subtitles: ") 12 13 #define LOC_WARN QString("Subtitles Warning: ") … … 62 63 VERBOSE(VB_IMPORTANT, LOC_WARN + "Failed to get CEA-608 reader."); 63 64 if (!m_708reader) 64 65 VERBOSE(VB_IMPORTANT, LOC_WARN + "Failed to get CEA-708 reader."); 65 m_useBackground = (bool) gCoreContext->GetNumSetting("CCBackground", 0);66 m_708fontZoom = gCoreContext->GetNumSetting("OSDCC708TextZoom", 100);66 m_useBackground = (bool)m_player->GetPlaySettings()->GetNumSetting("CCBackground", 0); 67 m_708fontZoom = m_player->GetPlaySettings()->GetNumSetting("OSDCC708TextZoom", 100); 67 68 return true; 68 69 } 69 70 -
libs/libmythtv/videoout_quartz.h
2 2 #define VIDEOOUT_QUARTZ_H_ 3 3 4 4 struct QuartzData; 5 class PlaySettings; 5 6 6 7 #include "videooutbase.h" 7 8 … … 9 10 { 10 11 public: 11 12 static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); 12 VideoOutputQuartz( );13 VideoOutputQuartz(PlaySettings *settings); 13 14 ~VideoOutputQuartz(); 14 15 15 16 bool Init(int width, int height, float aspect, WId winid, … … 52 53 static MythCodecID GetBestSupportedCodec( 53 54 uint width, uint height, 54 55 uint osd_width, uint osd_height, 55 uint stream_type, uint fourcc );56 uint stream_type, uint fourcc, PlaySettings *settings); 56 57 virtual bool NeedExtraAudioDecode(void) const 57 58 { return !codec_is_std(video_codec_id); } 58 59 -
libs/libmythtv/videodisplayprofile.cpp
8 8 #include "mythverbose.h" 9 9 #include "videooutbase.h" 10 10 #include "avformatdecoder.h" 11 #include "playsettings.h" 11 12 12 13 bool ProfileItem::IsMatch(const QSize &size, float rate) const 13 14 { … … 212 213 pref_map_t VideoDisplayProfile::dec_name; 213 214 safe_list_t VideoDisplayProfile::safe_decoders; 214 215 215 VideoDisplayProfile::VideoDisplayProfile( )216 VideoDisplayProfile::VideoDisplayProfile(PlaySettings *settings) 216 217 : lock(QMutex::Recursive), last_size(0,0), last_rate(0.0f), 217 218 last_video_renderer(QString::null) 218 219 { … … 220 221 init_statics(); 221 222 222 223 QString hostname = gCoreContext->GetHostName(); 223 QString cur_profile = GetDefaultProfileName(hostname );224 QString cur_profile = GetDefaultProfileName(hostname, settings); 224 225 uint groupid = GetProfileGroupID(cur_profile, hostname); 225 226 226 227 item_list_t items = LoadDB(groupid); … … 772 773 return list; 773 774 } 774 775 775 QString VideoDisplayProfile::GetDefaultProfileName(const QString &hostname) 776 QString VideoDisplayProfile::GetDefaultProfileName(const QString &hostname, 777 PlaySettings *settings) 776 778 { 777 779 QString tmp = 780 settings ? settings->GetSetting("DefaultVideoPlaybackProfile", "") : 778 781 gCoreContext->GetSettingOnHost("DefaultVideoPlaybackProfile", hostname); 779 782 780 783 QStringList profiles = GetProfiles(hostname); -
libs/libmythtv/videoout_null.h
9 9 { 10 10 public: 11 11 static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); 12 VideoOutputNull( );12 VideoOutputNull(PlaySettings *settings); 13 13 ~VideoOutputNull(); 14 14 15 15 bool Init(int width, int height, float aspect, WId winid, -
libs/libmyth/settings.cpp
235 235 return -1; 236 236 } 237 237 238 QString SelectSetting::GetValueLabel(const QString &value) 239 { 240 selectionList::const_iterator iterValues = values.begin(); 241 selectionList::const_iterator iterLabels = labels.begin(); 242 for (; iterValues != values.end() && iterLabels != labels.end(); 243 ++iterValues, ++iterLabels) 244 { 245 if (*iterValues == value) 246 return *iterLabels; 247 } 248 249 return "???"; 250 } 251 238 252 bool SelectSetting::ReplaceLabel(const QString &new_label, const QString &value) 239 253 { 240 254 int i = getValueIndex(value); … … 299 313 QLabel *label = new QLabel(); 300 314 label->setText(getLabel() + ": "); 301 315 layout->addWidget(label); 316 labelWidget = label; 302 317 } 303 318 304 319 bxwidget = widget; … … 327 342 328 343 widget->setLayout(layout); 329 344 345 setValue(getValue()); 346 330 347 return widget; 331 348 } 332 349 … … 336 353 { 337 354 bxwidget = NULL; 338 355 edit = NULL; 356 labelWidget = NULL; 339 357 } 340 358 } 341 359 … … 373 391 Setting::setHelpText(str); 374 392 } 375 393 394 static void adjustFont(QWidget *widget, bool isDefault) 395 { 396 if (widget) 397 { 398 QFont f = widget->font(); 399 f.setWeight(isDefault ? QFont::Light : QFont::Bold); 400 widget->setFont(f); 401 } 402 } 403 404 void LineEditSetting::setValue(const QString &newValue) 405 { 406 if (adjustOnBlank) 407 { 408 adjustFont(labelWidget, newValue.isEmpty()); 409 adjustFont(edit, newValue.isEmpty()); 410 } 411 Setting::setValue(newValue); 412 } 413 376 414 void BoundedIntegerSetting::setValue(int newValue) 377 415 { 378 416 newValue = std::max(std::min(newValue, max), min); … … 439 477 440 478 SpinBoxSetting::SpinBoxSetting( 441 479 Storage *_storage, int _min, int _max, int _step, 442 bool _allow_single_step, QString _special_value_text) : 480 bool _allow_single_step, QString _special_value_text, 481 bool change_style_on_special) : 443 482 BoundedIntegerSetting(_storage, _min, _max, _step), 444 483 spinbox(NULL), relayEnabled(true), 445 sstep(_allow_single_step), svtext("") 484 sstep(_allow_single_step), svtext(""), labelWidget(NULL), 485 changeOnSpecial(change_style_on_special) 446 486 { 447 487 if (!_special_value_text.isEmpty()) 448 488 svtext = _special_value_text; … … 476 516 QLabel *label = new QLabel(); 477 517 label->setText(getLabel() + ": "); 478 518 layout->addWidget(label); 519 labelWidget = label; 479 520 } 480 521 481 522 bxwidget = widget; … … 506 547 507 548 widget->setLayout(layout); 508 549 550 setValue(intValue()); 551 509 552 return widget; 510 553 } 511 554 … … 515 558 { 516 559 bxwidget = NULL; 517 560 spinbox = NULL; 561 labelWidget = NULL; 518 562 } 519 563 } 520 564 521 565 void SpinBoxSetting::setValue(int newValue) 522 566 { 523 567 newValue = std::max(std::min(newValue, max), min); 568 if (changeOnSpecial) 569 { 570 adjustFont(labelWidget, (newValue == min)); 571 adjustFont(spinbox, (newValue == min)); 572 } 524 573 if (spinbox && (spinbox->value() != newValue)) 525 574 { 526 575 //int old = intValue(); … … 631 680 QLabel *label = new QLabel(); 632 681 label->setText(getLabel() + ": "); 633 682 layout->addWidget(label); 683 labelWidget = label; 634 684 } 635 685 636 686 bxwidget = widget; … … 659 709 cbwidget, SLOT(clear())); 660 710 661 711 if (rw) 712 { 662 713 connect(cbwidget, SIGNAL(editTextChanged(const QString &)), 663 714 this, SLOT(editTextChanged(const QString &))); 715 connect(cbwidget, SIGNAL(editTextChanged(const QString &)), 716 this, SLOT(changeLabel(const QString &))); 717 } 664 718 665 719 if (cg) 666 720 connect(cbwidget, SIGNAL(changeHelpText(QString)), cg, … … 673 727 674 728 widget->setLayout(layout); 675 729 730 setValue(current); 731 676 732 return widget; 677 733 } 678 734 … … 682 738 { 683 739 bxwidget = NULL; 684 740 cbwidget = NULL; 741 labelWidget = NULL; 685 742 } 686 743 } 687 744 … … 717 774 718 775 if (rw) 719 776 { 777 changeLabel(newValue); 720 778 Setting::setValue(newValue); 721 779 if (cbwidget) 722 780 cbwidget->setCurrentIndex(current); … … 727 785 { 728 786 if (cbwidget) 729 787 cbwidget->setCurrentIndex(which); 788 changeLabel(labels[which]); 730 789 SelectSetting::setValue(which); 731 790 } 732 791 733 void ComboBoxSetting::addSelection( 734 const QString &label, QString value, bool select) 792 void ComboBoxSetting::changeLabel(const QString &newLabel) 735 793 { 794 if (changeOnSpecial) 795 { 796 adjustFont(labelWidget, specialLabel == newLabel); 797 adjustFont(cbwidget, specialLabel == newLabel); 798 } 799 } 800 801 void ComboBoxSetting::addSelection(const QString &label, QString value, 802 bool select, bool special_formatting) 803 { 736 804 if ((findSelection(label, value) < 0) && cbwidget) 737 805 { 738 806 resetMaxCount(cbwidget->count()+1); 739 807 cbwidget->insertItem(label); 740 808 } 741 809 810 if (special_formatting) 811 { 812 changeOnSpecial = true; 813 specialLabel = label; 814 } 815 742 816 SelectSetting::addSelection(label, value, select); 743 817 744 818 if (cbwidget && isSet) … … 955 1029 BooleanSetting::setHelpText(str); 956 1030 } 957 1031 1032 QWidget* TristateCheckBoxSetting::configWidget(ConfigurationGroup *cg, 1033 QWidget* parent, 1034 const char* widgetName) { 1035 widget = new MythCheckBox(parent, widgetName, true); 1036 connect(widget, SIGNAL(destroyed(QObject*)), 1037 this, SLOT(widgetDeleted(QObject*))); 1038 1039 widget->setHelpText(getHelpText()); 1040 widget->setText(getLabel()); 1041 widget->setCheckState(tristateValue()); 1042 setValue(tristateValue()); 1043 1044 connect(widget, SIGNAL(stateChanged(int)), 1045 this, SLOT(setValue(int))); 1046 connect(this, SIGNAL(valueChanged(int)), 1047 this, SLOT(relayValueChanged(int))); 1048 1049 if (cg) 1050 connect(widget, SIGNAL(changeHelpText(QString)), cg, 1051 SIGNAL(changeHelpText(QString))); 1052 1053 return widget; 1054 } 1055 1056 void TristateCheckBoxSetting::widgetInvalid(QObject *obj) 1057 { 1058 widget = (widget == obj) ? NULL : widget; 1059 } 1060 1061 void TristateCheckBoxSetting::setEnabled(bool fEnabled) 1062 { 1063 TristateSetting::setEnabled(fEnabled); 1064 if (widget) 1065 widget->setEnabled(fEnabled); 1066 } 1067 1068 void TristateCheckBoxSetting::setHelpText(const QString &str) 1069 { 1070 if (widget) 1071 widget->setHelpText(str); 1072 TristateSetting::setHelpText(str); 1073 } 1074 1075 const char *TristateSetting::kPartiallyCheckedString = "default"; 1076 1077 void TristateCheckBoxSetting::setValue(int check) 1078 { 1079 adjustFont(widget, (check != Qt::Checked && check != Qt::Unchecked)); 1080 TristateSetting::setValue(check); 1081 emit valueChanged(check); 1082 } 1083 1084 void TristateSetting::setValue(int check) 1085 { 1086 if (check == Qt::Checked) 1087 Setting::setValue("1"); 1088 else if (check == Qt::Unchecked) 1089 Setting::setValue("0"); 1090 else 1091 Setting::setValue(kPartiallyCheckedString); 1092 emit valueChanged(check); 1093 } 1094 958 1095 void AutoIncrementDBSetting::Save(QString table) 959 1096 { 960 1097 if (intValue() == 0) … … 1142 1279 addSelection(label, value, select); 1143 1280 } 1144 1281 1282 void ImageSelectSetting::addDefaultSelection(const QString label, 1283 const QString value, 1284 const QString defaultValue, 1285 bool select) 1286 { 1287 for (unsigned i=0; i<values.size(); i++) 1288 { 1289 if (values[i] == defaultValue) 1290 { 1291 changeOnSpecial = true; 1292 specialLabel = label; 1293 images.push_back(new QImage(*images[i])); 1294 addSelection(label, value, select); 1295 return; 1296 } 1297 } 1298 } 1299 1145 1300 ImageSelectSetting::~ImageSelectSetting() 1146 1301 { 1147 1302 Teardown(); … … 1164 1319 bxwidget = NULL; 1165 1320 imagelabel = NULL; 1166 1321 combo = NULL; 1322 labelWidget = NULL; 1167 1323 } 1168 1324 1169 1325 void ImageSelectSetting::imageSet(int num) … … 1211 1367 QLabel *label = new QLabel(); 1212 1368 label->setText(getLabel() + ":"); 1213 1369 layout->addWidget(label); 1370 labelWidget = label; 1214 1371 } 1215 1372 1216 1373 combo = new MythComboBox(false); … … 1257 1414 connect(combo, SIGNAL(highlighted(int)), this, SLOT(imageSet(int))); 1258 1415 connect(combo, SIGNAL(activated(int)), this, SLOT(setValue(int))); 1259 1416 connect(combo, SIGNAL(activated(int)), this, SLOT(imageSet(int))); 1417 connect(combo, SIGNAL(highlighted(const QString &)), 1418 this, SLOT(changeLabel(const QString &))); 1419 connect(combo, SIGNAL(activated(const QString &)), 1420 this, SLOT(changeLabel(const QString &))); 1260 1421 1261 1422 connect(this, SIGNAL(selectionsCleared()), 1262 1423 combo, SLOT(clear())); … … 1267 1428 1268 1429 bxwidget->setLayout(layout); 1269 1430 1431 changeLabel(GetLabel(current)); 1432 1270 1433 return bxwidget; 1271 1434 } 1272 1435 1436 void ImageSelectSetting::changeLabel(const QString &newLabel) 1437 { 1438 if (changeOnSpecial) 1439 { 1440 adjustFont(labelWidget, specialLabel == newLabel); 1441 adjustFont(combo, specialLabel == newLabel); 1442 } 1443 } 1444 1273 1445 void ImageSelectSetting::widgetInvalid(QObject *obj) 1274 1446 { 1275 1447 if (bxwidget == obj) -
libs/libmyth/mythwidgets.cpp
224 224 else if (action == "DOWN") 225 225 focusNextPrevChild(true); 226 226 else if (action == "LEFT" || action == "RIGHT" || action == "SELECT") 227 toggle(); 227 { 228 if (isTristate()) 229 { 230 Qt::CheckState newState = 231 (Qt::CheckState)(((int)checkState() + 1) % 3); 232 setCheckState(newState); 233 } 234 else 235 toggle(); 236 } 228 237 else 229 238 handled = false; 230 239 } -
libs/libmyth/settings.h
134 134 135 135 class MPUBLIC LineEditSetting : public Setting 136 136 { 137 Q_OBJECT 138 137 139 protected: 138 LineEditSetting(Storage *_storage, bool readwrite = true) : 140 LineEditSetting(Storage *_storage, bool readwrite = true, 141 bool adjust_on_blank = false) : 139 142 Setting(_storage), bxwidget(NULL), edit(NULL), 140 rw(readwrite), password_echo(false) { } 143 rw(readwrite), password_echo(false), 144 adjustOnBlank(adjust_on_blank), labelWidget(NULL) { } 141 145 142 146 public: 143 147 virtual QWidget* configWidget(ConfigurationGroup *cg, QWidget* parent, … … 159 163 160 164 virtual void setHelpText(const QString &str); 161 165 166 public slots: 167 virtual void setValue(const QString &newValue); 168 162 169 private: 163 170 QWidget *bxwidget; 164 171 MythLineEdit *edit; 165 172 bool rw; 166 173 bool password_echo; 174 bool adjustOnBlank; 175 QWidget *labelWidget; 167 176 }; 168 177 169 178 // TODO: set things up so that setting the value as a string emits … … 219 228 public: 220 229 SpinBoxSetting(Storage *_storage, int min, int max, int step, 221 230 bool allow_single_step = false, 222 QString special_value_text = ""); 231 QString special_value_text = "", 232 bool change_style_on_special = false); 223 233 224 234 virtual QWidget *configWidget(ConfigurationGroup *cg, QWidget *parent, 225 235 const char *widgetName = 0); … … 248 258 bool relayEnabled; 249 259 bool sstep; 250 260 QString svtext; 261 QLabel *labelWidget; 262 bool changeOnSpecial; 251 263 }; 252 264 253 265 class MPUBLIC SelectSetting : public Setting … … 277 289 { return (i < labels.size()) ? labels[i] : QString::null; } 278 290 virtual QString GetValue(uint i) const 279 291 { return (i < values.size()) ? values[i] : QString::null; } 292 virtual QString GetValueLabel(const QString &value); 280 293 281 294 signals: 282 295 void selectionAdded(const QString& label, QString value); … … 318 331 protected: 319 332 ComboBoxSetting(Storage *_storage, bool _rw = false, int _step = 1) : 320 333 SelectSetting(_storage), rw(_rw), 321 bxwidget(NULL), cbwidget(NULL), step(_step) { } 334 bxwidget(NULL), cbwidget(NULL), changeOnSpecial(false), 335 specialLabel(""), labelWidget(NULL), step(_step) { } 322 336 323 337 public: 324 338 virtual void setValue(QString newValue); … … 340 354 public slots: 341 355 void addSelection(const QString &label, 342 356 QString value = QString::null, 343 bool select = false); 357 bool select = false, 358 bool special_formatting = false); 344 359 bool removeSelection(const QString &label, 345 360 QString value = QString::null); 361 virtual void changeLabel(const QString &newValue); 346 362 void editTextChanged(const QString &newText); 347 363 348 364 private: 349 365 bool rw; 350 366 QWidget *bxwidget; 351 367 MythComboBox *cbwidget; 368 bool changeOnSpecial; 369 QString specialLabel; 370 QLabel *labelWidget; 352 371 353 372 protected: 354 373 int step; … … 417 436 ImageSelectSetting(Storage *_storage) : 418 437 SelectSetting(_storage), 419 438 bxwidget(NULL), imagelabel(NULL), combo(NULL), 420 m_hmult(1.0f), m_wmult(1.0f) { } 439 m_hmult(1.0f), m_wmult(1.0f), 440 changeOnSpecial(false), specialLabel(""), labelWidget(NULL) { } 421 441 virtual QWidget* configWidget(ConfigurationGroup *cg, QWidget* parent, 422 442 const char* widgetName = 0); 423 443 virtual void widgetInvalid(QObject *obj); … … 428 448 QImage* image, 429 449 QString value=QString::null, 430 450 bool select=false); 451 virtual void addDefaultSelection(const QString label, 452 const QString value, 453 const QString defaultValue, 454 bool select); 431 455 432 456 protected slots: 433 457 void imageSet(int); 458 void changeLabel(const QString &newLabel); 434 459 435 460 protected: 436 461 void Teardown(void); … … 442 467 QLabel *imagelabel; 443 468 MythComboBox *combo; 444 469 float m_hmult, m_wmult; 470 bool changeOnSpecial; 471 QString specialLabel; 472 QLabel *labelWidget; 445 473 }; 446 474 447 475 class MPUBLIC BooleanSetting : public Setting … … 484 512 MythCheckBox *widget; 485 513 }; 486 514 515 class MPUBLIC TristateSetting : public BooleanSetting 516 { 517 Q_OBJECT 518 519 public: 520 TristateSetting(Storage *_storage) : BooleanSetting(_storage) {} 521 522 Qt::CheckState tristateValue(void) const { 523 if (getValue() == "0") 524 return Qt::Unchecked; 525 if (getValue() == "1") 526 return Qt::Checked; 527 return Qt::PartiallyChecked; 528 } 529 530 static const char *kPartiallyCheckedString; 531 532 public slots: 533 virtual void setValue(/*Qt::CheckState*/int check); 534 535 signals: 536 void valueChanged(int); 537 }; 538 539 class MPUBLIC TristateCheckBoxSetting: public TristateSetting { 540 Q_OBJECT 541 542 public: 543 TristateCheckBoxSetting(Storage *_storage) : 544 TristateSetting(_storage), widget(NULL) { } 545 virtual QWidget* configWidget(ConfigurationGroup *cg, QWidget* parent, 546 const char* widgetName = 0); 547 virtual void widgetInvalid(QObject*); 548 549 virtual void setEnabled(bool b); 550 551 virtual void setHelpText(const QString &str); 552 553 554 public slots: 555 virtual void setValue(/*Qt::CheckState*/int check); 556 virtual void relayValueChanged(int state) { 557 if (widget) 558 widget->setCheckState((Qt::CheckState)state); 559 } 560 561 protected: 562 MythCheckBox *widget; 563 }; 564 487 565 class MPUBLIC PathSetting : public ComboBoxSetting 488 566 { 489 567 public: -
libs/libmyth/libmyth.pro
62 62 SOURCES += mythrssmanager.cpp netgrabbermanager.cpp 63 63 SOURCES += rssparse.cpp netutils.cpp 64 64 65 HEADERS += playsettings.h 66 SOURCES += playsettings.cpp 67 65 68 # remove when everything is switched to mythui 66 69 SOURCES += virtualkeyboard_qt.cpp 67 70 -
libs/libmyth/mythconfiggroups.cpp
476 476 Configurable *target) 477 477 { 478 478 VerifyLayout(); 479 bool isDuplicate = triggerMap.values().contains(target); 479 480 triggerMap[triggerValue] = target; 480 481 481 482 if (!configStack) … … 485 486 configStack->setSaveAll(isSaveAll); 486 487 } 487 488 488 configStack->addChild(target); 489 // Don't add a target as a child if it has already been added, 490 // otherwise something goes wrong with signals in the child. 491 if (!isDuplicate) 492 configStack->addChild(target); 489 493 } 490 494 491 495 Setting *TriggeredConfigurationGroup::byName(const QString &settingName) -
libs/libmyth/mythwidgets.h
329 329 Q_OBJECT 330 330 331 331 public: 332 MythCheckBox(QWidget *parent = 0, const char *name = "MythCheckBox") 333 : QCheckBox(parent) { setObjectName(name); }; 332 MythCheckBox(QWidget *parent = 0, const char *name = "MythCheckBox", 333 bool isTristate = false) : QCheckBox(parent) 334 { 335 setObjectName(name); 336 setTristate(isTristate); 337 } 334 338 MythCheckBox(const QString &text, 335 QWidget *parent = 0, const char *name = "MythCheckBox") 336 : QCheckBox(text, parent) { setObjectName(name); }; 339 QWidget *parent = 0, const char *name = "MythCheckBox", 340 bool isTristate = false) : QCheckBox(text, parent) 341 { 342 setObjectName(name); 343 setTristate(isTristate); 344 } 337 345 338 346 void setHelpText(const QString&); 339 347 -
programs/mythfrontend/globalsettings.cpp
38 38 #include "mythconfig.h" 39 39 #include "mythdirs.h" 40 40 #include "mythuihelper.h" 41 #include "playsettings.h" 41 42 43 #define CREATE_CHECKBOX_SETTING(var, name, settings) \ 44 BooleanSetting *var; \ 45 if ((settings)) \ 46 var = new PlaySettingsCheckBox((name), (settings)); \ 47 else \ 48 var = new HostCheckBox((name)) 49 50 #define CREATE_COMBOBOX_SETTING(var, name, settings) \ 51 ComboBoxSetting *var; \ 52 if ((settings)) \ 53 var = new PlaySettingsComboBox((name), (settings)); \ 54 else \ 55 var = new HostComboBox((name)) 56 57 #define CREATE_COMBOBOX1_SETTING(var, name, settings, arg1) \ 58 ComboBoxSetting *var; \ 59 if ((settings)) \ 60 var = new PlaySettingsComboBox((name), (settings), (arg1)); \ 61 else \ 62 var = new HostComboBox((name), (arg1)) 63 64 #define CREATE_SPINBOX_SETTING(var, name, settings, arg1, arg2, arg3, arg4) \ 65 SpinBoxSetting *var; \ 66 if ((settings)) \ 67 var = new PlaySettingsSpinBox((name), (settings), (arg1), (arg2), (arg3), (arg4)); \ 68 else \ 69 var = new HostSpinBox((name), (arg1), (arg2), (arg3), (arg4)) 70 71 #define CREATE_LINEEDIT_SETTING(var, name, settings) \ 72 LineEditSetting *var; \ 73 if ((settings)) \ 74 var = new PlaySettingsLineEdit((name), (settings), ""); \ 75 else \ 76 var = new HostLineEdit((name)) 77 78 // For PlaySettings, use a SpinBox instead of a Slider so that a 79 // default value can be easily used. 80 #define CREATE_SLIDER_SETTING(var, name, settings, arg1, arg2, arg3) \ 81 BoundedIntegerSetting *var; \ 82 if ((settings)) \ 83 var = new PlaySettingsSpinBox((name), (settings), (arg1), (arg2), (arg3)); \ 84 else \ 85 var = new HostSlider((name), (arg1), (arg2), (arg3)) 86 87 #define CREATE_IMAGESELECT_SETTING(var, name, settings) \ 88 ImageSelectSetting *var; \ 89 if ((settings)) \ 90 var = new PlaySettingsImageSelect((name), (settings)); \ 91 else \ 92 var = new HostImageSelect((name)) 93 94 static Setting *wrap(Setting *obj, PlaySettings *settings, 95 bool twoLineLabel=false) 96 { 97 if (!settings) 98 return obj; 99 100 // Get the setting name 101 PlaySettingsCombinedStorage *storage = 102 dynamic_cast<PlaySettingsCombinedStorage *>(obj); 103 const QString &name = storage->getName(); 104 105 // Get the default value and label. The label is different 106 // from the value for most object types. 107 QString defaultValue = settings->GetSetting(name, "", true); 108 QString defaultLabel(defaultValue); 109 if (dynamic_cast<BooleanSetting *>(obj)) 110 defaultLabel = (defaultValue == "0" || defaultValue.isEmpty() ? 111 QObject::tr("disabled") : QObject::tr("enabled")); 112 if (dynamic_cast<SpinBoxSetting *>(obj) && defaultValue.isEmpty()) 113 defaultLabel = "0"; 114 ComboBoxSetting *cb = dynamic_cast<ComboBoxSetting *>(obj); 115 if (cb) 116 { 117 defaultLabel = cb->GetValueLabel(defaultValue); 118 // Add the default selection to a ComboBox 119 cb->addSelection(QString("(") + QObject::tr("default") + ")", 120 storage->getDefault(), 121 !settings->IsOverridden(name), 122 true); 123 } 124 ImageSelectSetting *is = dynamic_cast<ImageSelectSetting *>(obj); 125 if (is) 126 { 127 defaultLabel = is->GetValueLabel(defaultValue); 128 // Add the default selection to a ImageSelect 129 is->addDefaultSelection(QString("(") + QObject::tr("default") + ")", 130 storage->getDefault(), 131 defaultValue, 132 !settings->IsOverridden(name)); 133 } 134 135 // Change the help text to include the default and its source. 136 QString helpPrefix; 137 if (dynamic_cast<LineEditSetting *>(obj)) 138 helpPrefix = QObject::tr("Leave blank to keep default value"); 139 else 140 helpPrefix = QObject::tr("Override default value"); 141 helpPrefix += " (" + defaultLabel + ") "; 142 QString inheritsFrom = settings->InheritsFrom(name); 143 if (inheritsFrom.isNull()) 144 helpPrefix += QObject::tr("from global settings"); 145 else 146 helpPrefix += QObject::tr("from group") + " " + inheritsFrom; 147 helpPrefix += ". " + obj->getHelpText(); 148 obj->setHelpText(helpPrefix); 149 150 // Change the label to include the default. 151 obj->setLabel(obj->getLabel() + (twoLineLabel ? "\n" : "") + 152 " (" + defaultLabel + ")"); 153 154 return obj; 155 } 156 42 157 class TriggeredItem : public TriggeredConfigurationGroup 43 158 { 44 159 public: … … 594 709 return gs; 595 710 } 596 711 597 static HostCheckBox *DecodeExtraAudio()712 static Setting *DecodeExtraAudio(PlaySettings *settings) 598 713 { 599 HostCheckBox *gc = new HostCheckBox("DecodeExtraAudio");714 CREATE_CHECKBOX_SETTING(gc, "DecodeExtraAudio", settings); 600 715 gc->setLabel(QObject::tr("Extra audio buffering")); 601 716 gc->setValue(true); 602 717 gc->setHelpText(QObject::tr("Enable this setting if MythTV is playing " … … 605 720 "effect on framegrabbers (MPEG-4/RTJPEG). MythTV will " 606 721 "keep extra audio data in its internal buffers to " 607 722 "workaround this bug.")); 608 return gc;723 return wrap(gc, settings); 609 724 } 610 725 611 static HostComboBox *PIPLocationComboBox()726 static Setting *PIPLocationComboBox(PlaySettings *settings) 612 727 { 613 HostComboBox *gc = new HostComboBox("PIPLocation");728 CREATE_COMBOBOX_SETTING(gc, "PIPLocation", settings); 614 729 gc->setLabel(QObject::tr("PIP video location")); 615 730 for (uint loc = 0; loc < kPIP_END; ++loc) 616 731 gc->addSelection(toString((PIPLocation) loc), QString::number(loc)); 617 732 gc->setHelpText(QObject::tr("Location of PIP Video window.")); 618 return gc;733 return wrap(gc, settings); 619 734 } 620 735 621 736 static HostComboBox *DisplayRecGroup() … … 701 816 return gc; 702 817 } 703 818 704 static HostCheckBox *SmartForward()819 static Setting *SmartForward(PlaySettings *settings) 705 820 { 706 HostCheckBox *gc = new HostCheckBox("SmartForward");821 CREATE_CHECKBOX_SETTING(gc, "SmartForward", settings); 707 822 gc->setLabel(QObject::tr("Smart fast forwarding")); 708 823 gc->setValue(false); 709 824 gc->setHelpText(QObject::tr("If enabled, then immediately after " 710 825 "rewinding, only skip forward the same amount as " 711 826 "skipping backwards.")); 712 return gc;827 return wrap(gc, settings); 713 828 } 714 829 715 static HostCheckBox *ExactSeeking()830 static Setting *ExactSeeking(PlaySettings *settings) 716 831 { 717 HostCheckBox *gc = new HostCheckBox("ExactSeeking");832 CREATE_CHECKBOX_SETTING(gc, "ExactSeeking", settings); 718 833 gc->setLabel(QObject::tr("Seek to exact frame")); 719 834 gc->setValue(false); 720 835 gc->setHelpText(QObject::tr("If enabled, seeking is frame exact, but " 721 836 "slower.")); 722 return gc;837 return wrap(gc, settings); 723 838 } 724 839 725 840 static GlobalComboBox *CommercialSkipMethod() … … 747 862 return gc; 748 863 } 749 864 750 static HostComboBox *AutoCommercialSkip()865 static Setting *AutoCommercialSkip(PlaySettings *settings) 751 866 { 752 HostComboBox *gc = new HostComboBox("AutoCommercialSkip");867 CREATE_COMBOBOX_SETTING(gc, "AutoCommercialSkip", settings); 753 868 gc->setLabel(QObject::tr("Automatically skip commercials")); 754 869 gc->addSelection(QObject::tr("Off"), "0"); 755 870 gc->addSelection(QObject::tr("Notify, but do not skip"), "2"); … … 758 873 "have been flagged during automatic commercial detection " 759 874 "or by the mythcommflag program, or just notify that a " 760 875 "commercial has been detected.")); 761 return gc;876 return wrap(gc, settings); 762 877 } 763 878 764 879 static GlobalCheckBox *AutoCommercialFlag() … … 844 959 return bc; 845 960 } 846 961 847 static HostSpinBox *CommRewindAmount()962 static Setting *CommRewindAmount(PlaySettings *settings) 848 963 { 849 HostSpinBox *gs = new HostSpinBox("CommRewindAmount", 0, 10, 1);964 CREATE_SPINBOX_SETTING(gs, "CommRewindAmount", settings, 0, 10, 1, false); 850 965 gs->setLabel(QObject::tr("Commercial skip automatic rewind amount (secs)")); 851 966 gs->setHelpText(QObject::tr("MythTV will automatically rewind " 852 967 "this many seconds after performing a commercial skip.")); 853 968 gs->setValue(0); 854 return gs;969 return wrap(gs, settings); 855 970 } 856 971 857 static HostSpinBox *CommNotifyAmount()972 static Setting *CommNotifyAmount(PlaySettings *settings) 858 973 { 859 HostSpinBox *gs = new HostSpinBox("CommNotifyAmount", 0, 10, 1);974 CREATE_SPINBOX_SETTING(gs, "CommNotifyAmount", settings, 0, 10, 1, false); 860 975 gs->setLabel(QObject::tr("Commercial skip notify amount (secs)")); 861 976 gs->setHelpText(QObject::tr("MythTV will act like a commercial " 862 977 "begins this many seconds early. This can be useful " 863 978 "when commercial notification is used in place of " 864 979 "automatic skipping.")); 865 980 gs->setValue(0); 866 return gs;981 return wrap(gs, settings); 867 982 } 868 983 869 984 static GlobalSpinBox *MaximumCommercialSkip() … … 1665 1780 labels[j]->setValue(label_i); 1666 1781 } 1667 1782 1668 PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str) : 1783 PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str, 1784 PlaySettings *settings) : 1669 1785 TriggeredConfigurationGroup(false, true, true, true, 1670 1786 false, false, true, true), grouptrigger(NULL) 1671 1787 { 1672 1788 setLabel(QObject::tr("Playback Profiles") + str); 1789 if (settings) 1790 setLabel(QObject::tr("Playback group settings for ") + 1791 settings->mGroupName + " - " + 1792 getLabel()); 1673 1793 1674 1794 QString host = gCoreContext->GetHostName(); 1675 1795 QStringList profiles = VideoDisplayProfile::GetProfiles(host); … … 1697 1817 profiles = VideoDisplayProfile::GetProfiles(host); 1698 1818 } 1699 1819 1700 QString profile = VideoDisplayProfile::GetDefaultProfileName(host );1820 QString profile = VideoDisplayProfile::GetDefaultProfileName(host, settings); 1701 1821 if (!profiles.contains(profile)) 1702 1822 { 1703 1823 profile = (profiles.contains("Normal")) ? "Normal" : profiles[0]; 1704 1824 VideoDisplayProfile::SetDefaultProfileName(profile, host); 1705 1825 } 1706 1826 1707 grouptrigger = new HostComboBox("DefaultVideoPlaybackProfile"); 1827 CREATE_COMBOBOX_SETTING(gs, "DefaultVideoPlaybackProfile", settings); 1828 grouptrigger = gs; 1708 1829 grouptrigger->setLabel(QObject::tr("Current Video Playback Profile")); 1709 1830 QStringList::const_iterator it; 1710 1831 for (it = profiles.begin(); it != profiles.end(); ++it) 1711 1832 grouptrigger->addSelection(ProgramInfo::i18n(*it), *it); 1833 if (settings) 1834 { 1835 addChild(wrap(grouptrigger, settings)); 1836 return; 1837 } 1712 1838 1713 1839 HorizontalConfigurationGroup *grp = 1714 1840 new HorizontalConfigurationGroup(false, false, true, true); … … 1841 1967 return gc; 1842 1968 } 1843 1969 1844 static HostSpinBox *FFRewReposTime()1970 static Setting *FFRewReposTime(PlaySettings *settings) 1845 1971 { 1846 HostSpinBox *gs = new HostSpinBox("FFRewReposTime", 0, 200, 5);1972 CREATE_SPINBOX_SETTING(gs, "FFRewReposTime", settings, 0, 200, 5, false); 1847 1973 gs->setLabel(QObject::tr("Fast forward/rewind reposition amount")); 1848 1974 gs->setValue(100); 1849 1975 gs->setHelpText(QObject::tr("When exiting sticky keys fast forward/rewind " … … 1851 1977 "resuming normal playback. This " 1852 1978 "compensates for the reaction time between seeing " 1853 1979 "where to resume playback and actually exiting seeking.")); 1854 return gs;1980 return wrap(gs, settings); 1855 1981 } 1856 1982 1857 static HostCheckBox *FFRewReverse()1983 static Setting *FFRewReverse(PlaySettings *settings) 1858 1984 { 1859 HostCheckBox *gc = new HostCheckBox("FFRewReverse");1985 CREATE_CHECKBOX_SETTING(gc, "FFRewReverse", settings); 1860 1986 gc->setLabel(QObject::tr("Reverse direction in fast forward/rewind")); 1861 1987 gc->setValue(true); 1862 1988 gc->setHelpText(QObject::tr("If enabled, pressing the sticky rewind key " … … 1864 1990 "vice versa. If disabled, it will decrease the " 1865 1991 "current speed or switch to play mode if " 1866 1992 "the speed can't be decreased further.")); 1867 return gc;1993 return wrap(gc, settings); 1868 1994 } 1869 1995 1870 1996 static HostComboBox *MenuTheme() … … 1915 2041 return gc; 1916 2042 } 1917 2043 1918 static HostSpinBox *OSDCC708TextZoomPercentage(void)2044 static Setting *OSDCC708TextZoomPercentage(PlaySettings *settings) 1919 2045 { 1920 HostSpinBox *gs = new HostSpinBox("OSDCC708TextZoom", 50, 200, 5); 2046 CREATE_SPINBOX_SETTING(gs, "OSDCC708TextZoom", settings, 2047 50, 200, 5, false); 1921 2048 gs->setLabel(QObject::tr("ATSC caption text zoom percentage")); 1922 2049 gs->setValue(100); 1923 2050 gs->setHelpText(QObject::tr("Use this to enlarge or shrink captions.")); 1924 2051 1925 return gs;2052 return wrap(gs, settings); 1926 2053 } 1927 2054 1928 2055 static HostComboBox *SubtitleFont() … … 1942 2069 return hcb; 1943 2070 } 1944 2071 1945 static HostComboBox *SubtitleCodec()2072 static Setting *SubtitleCodec(PlaySettings *settings) 1946 2073 { 1947 HostComboBox *gc = new HostComboBox("SubtitleCodec");2074 CREATE_COMBOBOX_SETTING(gc, "SubtitleCodec", settings); 1948 2075 1949 2076 gc->setLabel(QObject::tr("Subtitle Codec")); 1950 2077 QList<QByteArray> list = QTextCodec::availableCodecs(); … … 1954 2081 gc->addSelection(val, val, val.toLower() == "utf-8"); 1955 2082 } 1956 2083 1957 return gc;2084 return wrap(gc, settings); 1958 2085 } 1959 2086 1960 2087 static HostComboBox *ChannelOrdering() … … 1966 2093 return gc; 1967 2094 } 1968 2095 1969 static HostSpinBox *VertScanPercentage()2096 static Setting *VertScanPercentage(PlaySettings *settings) 1970 2097 { 1971 HostSpinBox *gs = new HostSpinBox("VertScanPercentage", -100, 100, 1); 2098 CREATE_SPINBOX_SETTING(gs, "VertScanPercentage", settings, 2099 -100, 100, 1, false); 1972 2100 gs->setLabel(QObject::tr("Vertical scaling")); 1973 2101 gs->setValue(0); 1974 2102 gs->setHelpText(QObject::tr( 1975 2103 "Adjust this if the image does not fill your " 1976 2104 "screen vertically. Range -100% to 100%")); 1977 return gs;2105 return wrap(gs, settings); 1978 2106 } 1979 2107 1980 static HostSpinBox *HorizScanPercentage()2108 static Setting *HorizScanPercentage(PlaySettings *settings) 1981 2109 { 1982 HostSpinBox *gs = new HostSpinBox("HorizScanPercentage", -100, 100, 1); 2110 CREATE_SPINBOX_SETTING(gs, "HorizScanPercentage", settings, 2111 -100, 100, 1, false); 1983 2112 gs->setLabel(QObject::tr("Horizontal scaling")); 1984 2113 gs->setValue(0); 1985 2114 gs->setHelpText(QObject::tr( 1986 2115 "Adjust this if the image does not fill your " 1987 2116 "screen horizontally. Range -100% to 100%")); 1988 return gs;2117 return wrap(gs, settings); 1989 2118 }; 1990 2119 1991 static HostSpinBox *XScanDisplacement()2120 static Setting *XScanDisplacement(PlaySettings *settings) 1992 2121 { 1993 HostSpinBox *gs = new HostSpinBox("XScanDisplacement", -50, 50, 1); 2122 CREATE_SPINBOX_SETTING(gs, "XScanDisplacement", settings, 2123 -50, 50, 1, false); 1994 2124 gs->setLabel(QObject::tr("Scan displacement (X)")); 1995 2125 gs->setValue(0); 1996 2126 gs->setHelpText(QObject::tr("Adjust this to move the image horizontally.")); 1997 return gs;2127 return wrap(gs, settings); 1998 2128 } 1999 2129 2000 static HostSpinBox *YScanDisplacement()2130 static Setting *YScanDisplacement(PlaySettings *settings) 2001 2131 { 2002 HostSpinBox *gs = new HostSpinBox("YScanDisplacement", -50, 50, 1); 2132 CREATE_SPINBOX_SETTING(gs, "YScanDisplacement", settings, 2133 -50, 50, 1, false); 2003 2134 gs->setLabel(QObject::tr("Scan displacement (Y)")); 2004 2135 gs->setValue(0); 2005 2136 gs->setHelpText(QObject::tr("Adjust this to move the image vertically.")); 2006 return gs;2137 return wrap(gs, settings); 2007 2138 }; 2008 2139 2009 2140 static HostCheckBox *AlwaysStreamFiles() … … 2018 2149 return gc; 2019 2150 } 2020 2151 2021 static HostCheckBox *CCBackground()2152 static Setting *CCBackground(PlaySettings *settings) 2022 2153 { 2023 HostCheckBox *gc = new HostCheckBox("CCBackground");2154 CREATE_CHECKBOX_SETTING(gc, "CCBackground", settings); 2024 2155 gc->setLabel(QObject::tr("Black background for closed captioning")); 2025 2156 gc->setValue(false); 2026 2157 gc->setHelpText(QObject::tr( 2027 2158 "If enabled, captions will be displayed " 2028 2159 "as white text over a black background " 2029 2160 "for better contrast.")); 2030 return gc;2161 return wrap(gc, settings); 2031 2162 } 2032 2163 2033 static HostCheckBox *DefaultCCMode()2164 static Setting *DefaultCCMode(PlaySettings *settings) 2034 2165 { 2035 HostCheckBox *gc = new HostCheckBox("DefaultCCMode");2166 CREATE_CHECKBOX_SETTING(gc, "DefaultCCMode", settings); 2036 2167 gc->setLabel(QObject::tr("Always display closed captioning or subtitles")); 2037 2168 gc->setValue(false); 2038 2169 gc->setHelpText(QObject::tr( … … 2040 2171 "when playing back recordings or watching " 2041 2172 "Live TV. Closed Captioning can be turned on or off " 2042 2173 "by pressing \"T\" during playback.")); 2043 return gc;2174 return wrap(gc, settings); 2044 2175 } 2045 2176 2046 static HostCheckBox *PreferCC708()2177 static Setting *PreferCC708(PlaySettings *settings) 2047 2178 { 2048 HostCheckBox *gc = new HostCheckBox("Prefer708Captions");2179 CREATE_CHECKBOX_SETTING(gc, "Prefer708Captions", settings); 2049 2180 gc->setLabel(QObject::tr("Prefer EIA-708 over EIA-608 captions")); 2050 2181 gc->setValue(true); 2051 2182 gc->setHelpText( … … 2053 2184 "If enabled, the newer EIA-708 captions will be preferred over " 2054 2185 "the older EIA-608 captions in ATSC streams.")); 2055 2186 2056 return gc;2187 return wrap(gc, settings); 2057 2188 } 2058 2189 2059 static HostCheckBox *EnableMHEG()2190 static Setting *EnableMHEG(PlaySettings *settings) 2060 2191 { 2061 HostCheckBox *gc = new HostCheckBox("EnableMHEG");2192 CREATE_CHECKBOX_SETTING(gc, "EnableMHEG", settings); 2062 2193 gc->setLabel(QObject::tr("Enable interactive TV")); 2063 2194 gc->setValue(false); 2064 2195 gc->setHelpText(QObject::tr( 2065 2196 "If enabled, interactive TV applications (MHEG) will " 2066 2197 "be activated. This is used for teletext and logos for " 2067 2198 "radio and channels that are currently off-air.")); 2068 return gc;2199 return wrap(gc, settings); 2069 2200 } 2070 2201 2071 static HostCheckBox *PersistentBrowseMode()2202 static Setting *PersistentBrowseMode(PlaySettings *settings) 2072 2203 { 2073 HostCheckBox *gc = new HostCheckBox("PersistentBrowseMode");2204 CREATE_CHECKBOX_SETTING(gc, "PersistentBrowseMode", settings); 2074 2205 gc->setLabel(QObject::tr("Always use browse mode in Live TV")); 2075 2206 gc->setValue(true); 2076 2207 gc->setHelpText( 2077 2208 QObject::tr( 2078 2209 "If enabled, browse mode will automatically be activated " 2079 2210 "whenever you use channel up/down while watching Live TV.")); 2080 return gc;2211 return wrap(gc, settings); 2081 2212 } 2082 2213 2083 static HostCheckBox *BrowseAllTuners()2214 static Setting *BrowseAllTuners(PlaySettings *settings) 2084 2215 { 2085 HostCheckBox *gc = new HostCheckBox("BrowseAllTuners");2216 CREATE_CHECKBOX_SETTING(gc, "BrowseAllTuners", settings); 2086 2217 gc->setLabel(QObject::tr("Browse all channels")); 2087 2218 gc->setValue(false); 2088 2219 gc->setHelpText( … … 2090 2221 "If enabled, browse mode will shows channels on all " 2091 2222 "available recording devices, instead of showing " 2092 2223 "channels on just the current recorder.")); 2093 return gc;2224 return wrap(gc, settings); 2094 2225 } 2095 2226 2096 static HostCheckBox *ClearSavedPosition()2227 static Setting *ClearSavedPosition(PlaySettings *settings) 2097 2228 { 2098 HostCheckBox *gc = new HostCheckBox("ClearSavedPosition");2229 CREATE_CHECKBOX_SETTING(gc, "ClearSavedPosition", settings); 2099 2230 gc->setLabel(QObject::tr("Clear bookmark on playback")); 2100 2231 gc->setValue(true); 2101 2232 gc->setHelpText(QObject::tr("If enabled, automatically clear the " 2102 2233 "bookmark on a recording when the recording is played " 2103 2234 "back. If disabled, you can mark the beginning with " 2104 2235 "rewind then save position.")); 2105 return gc;2236 return wrap(gc, settings); 2106 2237 } 2107 2238 2108 static HostCheckBox *AltClearSavedPosition()2239 static Setting *AltClearSavedPosition(PlaySettings *settings) 2109 2240 { 2110 HostCheckBox *gc = new HostCheckBox("AltClearSavedPosition");2241 CREATE_CHECKBOX_SETTING(gc, "AltClearSavedPosition", settings); 2111 2242 gc->setLabel(QObject::tr("Alternate clear and save bookmark")); 2112 2243 gc->setValue(true); 2113 2244 gc->setHelpText(QObject::tr("During playback the SELECT key " … … 2115 2246 "Saved\" and \"Bookmark Cleared\". If disabled, the " 2116 2247 "SELECT key will save the current position for each " 2117 2248 "keypress.")); 2118 return gc;2249 return wrap(gc, settings); 2119 2250 } 2120 2251 2121 2252 #if defined(USING_XV) || defined(USING_OPENGL_VIDEO) || defined(USING_VDPAU) 2122 static HostCheckBox *UsePicControls()2253 static Setting *UsePicControls(PlaySettings *settings) 2123 2254 { 2124 HostCheckBox *gc = new HostCheckBox("UseOutputPictureControls");2255 CREATE_CHECKBOX_SETTING(gc, "UseOutputPictureControls", settings); 2125 2256 gc->setLabel(QObject::tr("Enable picture controls")); 2126 2257 gc->setValue(false); 2127 2258 gc->setHelpText( 2128 2259 QObject::tr( 2129 2260 "If enabled, MythTV attempts to initialize picture controls " 2130 2261 "(brightness, contrast, etc.) that are applied during playback.")); 2131 return gc;2262 return wrap(gc, settings); 2132 2263 } 2133 2264 #endif 2134 2265 2135 static HostLineEdit *UDPNotifyPort()2266 static Setting *UDPNotifyPort(PlaySettings *settings) 2136 2267 { 2137 HostLineEdit *ge = new HostLineEdit("UDPNotifyPort");2268 CREATE_LINEEDIT_SETTING(ge, "UDPNotifyPort", settings); 2138 2269 ge->setLabel(QObject::tr("UDP notify port")); 2139 2270 ge->setValue("6948"); 2140 2271 ge->setHelpText(QObject::tr("During playback, MythTV will listen for " 2141 2272 "connections from the \"mythtvosd\" or \"mythudprelay\" " 2142 2273 "programs on this port. For additional information, see " 2143 2274 "http://www.mythtv.org/wiki/MythNotify .")); 2144 return ge;2275 return wrap(ge, settings); 2145 2276 } 2146 2277 2147 static HostComboBox *PlaybackExitPrompt()2278 static Setting *PlaybackExitPrompt(PlaySettings *settings) 2148 2279 { 2149 HostComboBox *gc = new HostComboBox("PlaybackExitPrompt");2280 CREATE_COMBOBOX_SETTING(gc, "PlaybackExitPrompt", settings); 2150 2281 gc->setLabel(QObject::tr("Action on playback exit")); 2151 2282 gc->addSelection(QObject::tr("Just exit"), "0"); 2152 2283 gc->addSelection(QObject::tr("Save position and exit"), "2"); … … 2157 2288 "when you exit playback mode. The options available will " 2158 2289 "allow you to save your position, delete the " 2159 2290 "recording, or continue watching.")); 2160 return gc;2291 return wrap(gc, settings); 2161 2292 } 2162 2293 2163 static HostCheckBox *EndOfRecordingExitPrompt()2294 static Setting *EndOfRecordingExitPrompt(PlaySettings *settings) 2164 2295 { 2165 HostCheckBox *gc = new HostCheckBox("EndOfRecordingExitPrompt");2296 CREATE_CHECKBOX_SETTING(gc, "EndOfRecordingExitPrompt", settings); 2166 2297 gc->setLabel(QObject::tr("Prompt at end of recording")); 2167 2298 gc->setValue(false); 2168 2299 gc->setHelpText(QObject::tr("If enabled, a menu will be displayed allowing " 2169 2300 "you to delete the recording when it has finished " 2170 2301 "playing.")); 2171 return gc;2302 return wrap(gc, settings); 2172 2303 } 2173 2304 2174 static HostCheckBox *JumpToProgramOSD()2305 static Setting *JumpToProgramOSD(PlaySettings *settings) 2175 2306 { 2176 HostCheckBox *gc = new HostCheckBox("JumpToProgramOSD");2307 CREATE_CHECKBOX_SETTING(gc, "JumpToProgramOSD", settings); 2177 2308 gc->setLabel(QObject::tr("Jump to program OSD")); 2178 2309 gc->setValue(true); 2179 2310 gc->setHelpText(QObject::tr( … … 2182 2313 "'Watch Recording' screen when 'Jump to Program' " 2183 2314 "is activated. If enabled, the recordings are shown " 2184 2315 "in the OSD")); 2185 return gc;2316 return wrap(gc, settings); 2186 2317 } 2187 2318 2188 static HostCheckBox *ContinueEmbeddedTVPlay()2319 static Setting *ContinueEmbeddedTVPlay(PlaySettings *settings) 2189 2320 { 2190 HostCheckBox *gc = new HostCheckBox("ContinueEmbeddedTVPlay");2321 CREATE_CHECKBOX_SETTING(gc, "ContinueEmbeddedTVPlay", settings); 2191 2322 gc->setLabel(QObject::tr("Continue playback when embedded")); 2192 2323 gc->setValue(false); 2193 2324 gc->setHelpText(QObject::tr( … … 2195 2326 "is embedded in the upcoming program list or recorded " 2196 2327 "list. The default is to pause the recorded show when " 2197 2328 "embedded.")); 2198 return gc;2329 return wrap(gc, settings); 2199 2330 } 2200 2331 2201 static HostCheckBox *AutomaticSetWatched()2332 static Setting *AutomaticSetWatched(PlaySettings *settings) 2202 2333 { 2203 HostCheckBox *gc = new HostCheckBox("AutomaticSetWatched");2334 CREATE_CHECKBOX_SETTING(gc, "AutomaticSetWatched", settings); 2204 2335 gc->setLabel(QObject::tr("Automatically mark a recording as watched")); 2205 2336 gc->setValue(false); 2206 2337 gc->setHelpText(QObject::tr("If enabled, when you exit near the end of a " … … 2208 2339 "detection is not foolproof, so do not enable this " 2209 2340 "setting if you don't want an unwatched recording marked " 2210 2341 "as watched.")); 2211 return gc;2342 return wrap(gc, settings); 2212 2343 } 2213 2344 2214 2345 static HostSpinBox *LiveTVIdleTimeout() … … 2408 2539 return gc; 2409 2540 } 2410 2541 2411 static HostComboBox *LetterboxingColour()2542 static Setting *LetterboxingColour(PlaySettings *settings) 2412 2543 { 2413 HostComboBox *gc = new HostComboBox("LetterboxColour");2544 CREATE_COMBOBOX_SETTING(gc, "LetterboxColour", settings); 2414 2545 gc->setLabel(QObject::tr("Letterboxing color")); 2415 2546 for (int m = kLetterBoxColour_Black; m < kLetterBoxColour_END; ++m) 2416 2547 gc->addSelection(toString((LetterBoxColour)m), QString::number(m)); … … 2420 2551 "letterboxing, but those with plasma screens may prefer gray " 2421 2552 "to minimize burn-in.") + " " + 2422 2553 QObject::tr("Currently only works with XVideo video renderer.")); 2423 return gc;2554 return wrap(gc, settings); 2424 2555 } 2425 2556 2426 static HostComboBox *AspectOverride()2557 static Setting *AspectOverride(PlaySettings *settings) 2427 2558 { 2428 HostComboBox *gc = new HostComboBox("AspectOverride");2559 CREATE_COMBOBOX_SETTING(gc, "AspectOverride", settings); 2429 2560 gc->setLabel(QObject::tr("Video aspect override")); 2430 2561 for (int m = kAspect_Off; m < kAspect_END; ++m) 2431 2562 gc->addSelection(toString((AspectOverrideMode)m), QString::number(m)); … … 2433 2564 "When enabled, these will override the aspect " 2434 2565 "ratio specified by any broadcaster for all " 2435 2566 "video streams.")); 2436 return gc;2567 return wrap(gc, settings); 2437 2568 } 2438 2569 2439 static HostComboBox *AdjustFill()2570 static Setting *AdjustFill(PlaySettings *settings) 2440 2571 { 2441 HostComboBox *gc = new HostComboBox("AdjustFill");2572 CREATE_COMBOBOX_SETTING(gc, "AdjustFill", settings); 2442 2573 gc->setLabel(QObject::tr("Zoom")); 2443 2574 gc->addSelection(toString(kAdjustFill_AutoDetect_DefaultOff), 2444 2575 QString::number(kAdjustFill_AutoDetect_DefaultOff)); … … 2449 2580 gc->setHelpText(QObject::tr( 2450 2581 "When enabled, these will apply a predefined " 2451 2582 "zoom to all video playback in MythTV.")); 2452 return gc;2583 return wrap(gc, settings); 2453 2584 } 2454 2585 2455 2586 // Theme settings … … 2876 3007 return gc; 2877 3008 } 2878 3009 2879 ThemeSelector::ThemeSelector(QString label): 2880 HostImageSelect(label){2881 3010 static Setting *ThemeSelector(QString label, PlaySettings *settings=NULL) 3011 { 3012 CREATE_IMAGESELECT_SETTING(gs, label, settings); 2882 3013 ThemeType themetype = THEME_UI; 2883 3014 2884 3015 if (label == "Theme") 2885 3016 { 2886 3017 themetype = THEME_UI; 2887 setLabel(QObject::tr("UI theme"));3018 gs->setLabel(QObject::tr("UI theme")); 2888 3019 } 2889 3020 else if (label == "MenuTheme") 2890 3021 { 2891 3022 themetype = THEME_MENU; 2892 setLabel(QObject::tr("Menu theme"));3023 gs->setLabel(QObject::tr("Menu theme")); 2893 3024 } 2894 3025 2895 3026 QDir themes(GetThemesParentDir()); … … 2953 3084 VERBOSE(VB_IMPORTANT, QString("Problem reading theme preview image" 2954 3085 " %1").arg(preview.filePath())); 2955 3086 2956 addImageSelection(name, previewImage, theme.fileName());3087 gs->addImageSelection(name, previewImage, theme.fileName()); 2957 3088 } 2958 3089 2959 3090 if (themetype & THEME_UI) 2960 setValue(DEFAULT_UI_THEME); 3091 gs->setValue(DEFAULT_UI_THEME); 3092 3093 return wrap(gs, settings); 2961 3094 } 2962 3095 2963 3096 static HostComboBox *ChannelFormat() … … 3462 3595 return gs; 3463 3596 } 3464 3597 3465 static HostCheckBox *RealtimePriority()3598 static Setting *RealtimePriority(PlaySettings *settings) 3466 3599 { 3467 HostCheckBox *gc = new HostCheckBox("RealtimePriority");3600 CREATE_CHECKBOX_SETTING(gc, "RealtimePriority", settings); 3468 3601 gc->setLabel(QObject::tr("Enable realtime priority threads")); 3469 3602 gc->setHelpText(QObject::tr("When running mythfrontend with root " 3470 3603 "privileges, some threads can be given enhanced priority. " 3471 3604 "Disable this if mythfrontend freezes during video " 3472 3605 "playback.")); 3473 3606 gc->setValue(true); 3474 return gc;3607 return wrap(gc, settings, false); 3475 3608 } 3476 3609 3477 3610 static HostCheckBox *EnableMediaMon() … … 3627 3760 }; 3628 3761 3629 3762 #ifdef USING_OPENGL_VSYNC 3630 static HostCheckBox *UseOpenGLVSync()3763 static Setting *UseOpenGLVSync(PlaySettings *settings) 3631 3764 { 3632 HostCheckBox *gc = new HostCheckBox("UseOpenGLVSync");3765 CREATE_CHECKBOX_SETTING(gc, "UseOpenGLVSync", settings); 3633 3766 gc->setLabel(QObject::tr("Enable OpenGL vertical sync for timing")); 3634 3767 gc->setValue(false); 3635 3768 gc->setHelpText(QObject::tr( 3636 3769 "If supported by your hardware/drivers, " 3637 3770 "MythTV will use OpenGL vertical syncing for " 3638 3771 "video timing, reducing frame jitter.")); 3639 return gc;3772 return wrap(gc, settings); 3640 3773 } 3641 3774 #endif 3642 3775 … … 4062 4195 return gc; 4063 4196 } 4064 4197 4065 MainGeneralSettings::MainGeneralSettings() 4198 MainGeneralSettings::MainGeneralSettings(PlaySettings *settings, 4199 ConfigurationWizard *base) 4066 4200 { 4201 if (!settings) 4202 { 4067 4203 DatabaseSettings::addDatabaseSettings(this); 4068 4204 4069 4205 VerticalConfigurationGroup *pin = … … 4116 4252 remotecontrol->addChild(NetworkControlEnabled()); 4117 4253 remotecontrol->addChild(NetworkControlPort()); 4118 4254 addChild(remotecontrol); 4255 } 4119 4256 } 4120 4257 4121 PlaybackSettings::PlaybackSettings() 4258 PlaybackSettings::PlaybackSettings(PlaySettings *settings, 4259 ConfigurationWizard *base) 4122 4260 { 4123 4261 uint i = 0, total = 8; 4124 4262 #if CONFIG_DARWIN 4125 4263 total += 2; 4126 4264 #endif // USING_DARWIN 4265 if (settings) 4266 total -= 3; 4127 4267 4128 4268 4129 4269 VerticalConfigurationGroup* general1 = 4130 4270 new VerticalConfigurationGroup(false); 4131 4271 general1->setLabel(QObject::tr("General Playback") + 4132 4272 QString(" (%1/%2)").arg(++i).arg(total)); 4273 if (settings) 4274 general1->setLabel(QObject::tr("Playback group settings for ") + 4275 settings->mGroupName + " - " + 4276 general1->getLabel()); 4133 4277 4134 4278 HorizontalConfigurationGroup *columns = 4135 4279 new HorizontalConfigurationGroup(false, false, true, true); 4136 4280 4137 4281 VerticalConfigurationGroup *column1 = 4138 4282 new VerticalConfigurationGroup(false, false, true, true); 4139 column1->addChild(RealtimePriority()); 4140 column1->addChild(DecodeExtraAudio()); 4141 column1->addChild(JumpToProgramOSD()); 4283 if (!settings) 4284 column1->addChild(RealtimePriority(settings)); 4285 column1->addChild(DecodeExtraAudio(settings)); 4286 column1->addChild(JumpToProgramOSD(settings)); 4142 4287 columns->addChild(column1); 4143 4288 4144 4289 VerticalConfigurationGroup *column2 = 4145 4290 new VerticalConfigurationGroup(false, false, true, true); 4146 column2->addChild(ClearSavedPosition( ));4147 column2->addChild(AltClearSavedPosition( ));4148 column2->addChild(AutomaticSetWatched( ));4149 column2->addChild(ContinueEmbeddedTVPlay( ));4291 column2->addChild(ClearSavedPosition(settings)); 4292 column2->addChild(AltClearSavedPosition(settings)); 4293 column2->addChild(AutomaticSetWatched(settings)); 4294 column2->addChild(ContinueEmbeddedTVPlay(settings)); 4150 4295 columns->addChild(column2); 4151 4296 4152 4297 general1->addChild(columns); 4153 general1->addChild(LiveTVIdleTimeout()); 4154 general1->addChild(AlwaysStreamFiles()); 4298 if (!settings) 4299 general1->addChild(LiveTVIdleTimeout()); 4300 if (!settings) 4301 general1->addChild(AlwaysStreamFiles()); 4155 4302 #ifdef USING_OPENGL_VSYNC 4156 general1->addChild(UseOpenGLVSync( ));4303 general1->addChild(UseOpenGLVSync(settings)); 4157 4304 #endif // USING_OPENGL_VSYNC 4158 4305 #if defined(USING_XV) || defined(USING_OPENGL_VIDEO) || defined(USING_VDPAU) 4159 general1->addChild(UsePicControls( ));4306 general1->addChild(UsePicControls(settings)); 4160 4307 #endif // USING_XV 4161 addChild(general1); 4308 if (base) 4309 base->addChild(general1); 4310 else 4311 addChild(general1); 4162 4312 4163 4313 VerticalConfigurationGroup* general2 = 4164 4314 new VerticalConfigurationGroup(false); 4165 4315 general2->setLabel(QObject::tr("General Playback") + 4166 4316 QString(" (%1/%2)").arg(++i).arg(total)); 4317 if (settings) 4318 general2->setLabel(QObject::tr("Playback group settings for ") + 4319 settings->mGroupName + " - " + 4320 general2->getLabel()); 4167 4321 4168 4322 HorizontalConfigurationGroup* oscan = 4169 4323 new HorizontalConfigurationGroup(false, false, true, true); … … 4171 4325 new VerticalConfigurationGroup(false, false, true, true); 4172 4326 VerticalConfigurationGroup *ocol2 = 4173 4327 new VerticalConfigurationGroup(false, false, true, true); 4174 ocol1->addChild(VertScanPercentage( ));4175 ocol1->addChild(YScanDisplacement( ));4176 ocol2->addChild(HorizScanPercentage( ));4177 ocol2->addChild(XScanDisplacement( ));4328 ocol1->addChild(VertScanPercentage(settings)); 4329 ocol1->addChild(YScanDisplacement(settings)); 4330 ocol2->addChild(HorizScanPercentage(settings)); 4331 ocol2->addChild(XScanDisplacement(settings)); 4178 4332 oscan->addChild(ocol1); 4179 4333 oscan->addChild(ocol2); 4180 4334 4181 4335 HorizontalConfigurationGroup* aspect_fill = 4182 4336 new HorizontalConfigurationGroup(false, false, true, true); 4183 aspect_fill->addChild(AspectOverride( ));4184 aspect_fill->addChild(AdjustFill( ));4337 aspect_fill->addChild(AspectOverride(settings)); 4338 aspect_fill->addChild(AdjustFill(settings)); 4185 4339 4186 4340 general2->addChild(oscan); 4187 4341 general2->addChild(aspect_fill); 4188 general2->addChild(LetterboxingColour()); 4189 general2->addChild(PIPLocationComboBox()); 4190 general2->addChild(PlaybackExitPrompt()); 4191 general2->addChild(EndOfRecordingExitPrompt()); 4192 addChild(general2); 4342 general2->addChild(LetterboxingColour(settings)); 4343 general2->addChild(PIPLocationComboBox(settings)); 4344 general2->addChild(PlaybackExitPrompt(settings)); 4345 general2->addChild(EndOfRecordingExitPrompt(settings)); 4346 if (base) 4347 base->addChild(general2); 4348 else 4349 addChild(general2); 4193 4350 4194 4351 QString tmp = QString(" (%1/%2)").arg(++i).arg(total); 4195 addChild(new PlaybackProfileConfigs(tmp)); 4352 if (base) 4353 base->addChild(new PlaybackProfileConfigs(tmp, settings)); 4354 else 4355 addChild(new PlaybackProfileConfigs(tmp, settings)); 4196 4356 4357 if (!settings) 4358 { 4197 4359 VerticalConfigurationGroup* pbox = new VerticalConfigurationGroup(false); 4198 4360 pbox->setLabel(QObject::tr("View Recordings") + 4199 4361 QString(" (%1/%2)").arg(++i).arg(total)); … … 4220 4382 pbox3->addChild(DisplayGroupTitleSort()); 4221 4383 pbox3->addChild(new WatchListSettings()); 4222 4384 addChild(pbox3); 4385 } 4223 4386 4224 4387 VerticalConfigurationGroup* seek = new VerticalConfigurationGroup(false); 4225 4388 seek->setLabel(QObject::tr("Seeking") + 4226 4389 QString(" (%1/%2)").arg(++i).arg(total)); 4227 seek->addChild(SmartForward()); 4228 seek->addChild(FFRewReposTime()); 4229 seek->addChild(FFRewReverse()); 4230 seek->addChild(ExactSeeking()); 4231 addChild(seek); 4390 if (settings) 4391 seek->setLabel(QObject::tr("Playback group settings for ") + 4392 settings->mGroupName + " - " + 4393 seek->getLabel()); 4394 seek->addChild(SmartForward(settings)); 4395 seek->addChild(FFRewReposTime(settings)); 4396 seek->addChild(FFRewReverse(settings)); 4397 seek->addChild(ExactSeeking(settings)); 4398 if (base) 4399 base->addChild(seek); 4400 else 4401 addChild(seek); 4232 4402 4233 4403 VerticalConfigurationGroup* comms = new VerticalConfigurationGroup(false); 4234 4404 comms->setLabel(QObject::tr("Commercial Skip") + 4235 4405 QString(" (%1/%2)").arg(++i).arg(total)); 4236 comms->addChild(AutoCommercialSkip()); 4237 comms->addChild(CommRewindAmount()); 4238 comms->addChild(CommNotifyAmount()); 4406 if (settings) 4407 comms->setLabel(QObject::tr("Playback group settings for ") + 4408 settings->mGroupName + " - " + 4409 comms->getLabel()); 4410 comms->addChild(AutoCommercialSkip(settings)); 4411 comms->addChild(CommRewindAmount(settings)); 4412 comms->addChild(CommNotifyAmount(settings)); 4413 if (!settings) // these are global settings, not host-specific 4414 { 4239 4415 comms->addChild(MaximumCommercialSkip()); 4240 4416 comms->addChild(MergeShortCommBreaks()); 4241 4417 comms->addChild(CommSkipAllBlanks()); 4242 addChild(comms); 4418 } 4419 if (base) 4420 base->addChild(comms); 4421 else 4422 addChild(comms); 4243 4423 4244 4424 #if CONFIG_DARWIN 4245 4425 VerticalConfigurationGroup* mac1 = new VerticalConfigurationGroup(false); 4246 4426 mac1->setLabel(QObject::tr("Mac OS X Video Settings") + 4247 4427 QString(" (%1/%2)").arg(++i).arg(total)); 4428 if (settings) 4429 mac1->setLabel(QObject::tr("Playback group settings for ") + 4430 settings->mGroupName + " - " + 4431 mac1->getLabel()); 4432 if (!settings) 4433 { 4248 4434 mac1->addChild(MacGammaCorrect()); 4249 4435 mac1->addChild(MacScaleUp()); 4250 4436 mac1->addChild(MacFullSkip()); 4251 addChild(mac1); 4437 } 4438 if (base) 4439 base->addChild(mac1); 4440 else 4441 addChild(mac1); 4252 4442 4253 4443 VerticalConfigurationGroup* mac2 = new VerticalConfigurationGroup(false); 4254 4444 mac2->setLabel(QObject::tr("Mac OS X Video Settings") + 4255 4445 QString(" (%1/%2)").arg(++i).arg(total)); 4446 if (settings) 4447 mac2->setLabel(QObject::tr("Playback group settings for ") + 4448 settings->mGroupName + " - " + 4449 mac2->getLabel()); 4450 if (!setings) 4451 { 4256 4452 mac2->addChild(new MacMainSettings()); 4257 4453 mac2->addChild(new MacFloatSettings()); 4258 4454 … … 4266 4462 #endif 4267 4463 } 4268 4464 4269 OSDSettings::OSDSettings() 4465 OSDSettings::OSDSettings(PlaySettings *settings, 4466 ConfigurationWizard *base) 4270 4467 { 4271 4468 VerticalConfigurationGroup* osd = new VerticalConfigurationGroup(false); 4272 4469 osd->setLabel(QObject::tr("On-screen Display")); 4470 if (settings) 4471 osd->setLabel(QObject::tr("Playback group settings for ") + 4472 settings->mGroupName + " - " + 4473 osd->getLabel()); 4273 4474 4274 osd->addChild(EnableMHEG()); 4275 osd->addChild(PersistentBrowseMode()); 4276 osd->addChild(BrowseAllTuners()); 4475 if (!settings) 4476 { 4477 osd->addChild(EnableMHEG(settings)); 4478 osd->addChild(PersistentBrowseMode(settings)); 4479 osd->addChild(BrowseAllTuners(settings)); 4277 4480 osd->addChild(SubtitleFont()); 4278 osd->addChild(SubtitleCodec()); 4279 osd->addChild(UDPNotifyPort()); 4280 addChild(osd); 4481 osd->addChild(SubtitleCodec(settings)); 4482 osd->addChild(UDPNotifyPort(settings)); 4483 } 4484 if (base) 4485 base->addChild(osd); 4486 else 4487 addChild(osd); 4281 4488 4282 4489 VerticalConfigurationGroup *cc = new VerticalConfigurationGroup(false); 4283 4490 cc->setLabel(QObject::tr("Closed Captions")); 4491 if (settings) 4492 cc->setLabel(QObject::tr("Playback group settings for ") + 4493 settings->mGroupName + " - " + 4494 cc->getLabel()); 4284 4495 //cc->addChild(DecodeVBIFormat()); 4285 cc->addChild(CCBackground()); 4286 cc->addChild(DefaultCCMode()); 4287 cc->addChild(PreferCC708()); 4288 cc->addChild(OSDCC708TextZoomPercentage()); 4289 addChild(cc); 4496 cc->addChild(CCBackground(settings)); 4497 cc->addChild(DefaultCCMode(settings)); 4498 cc->addChild(PreferCC708(settings)); 4499 cc->addChild(OSDCC708TextZoomPercentage(settings)); 4500 if (base) 4501 base->addChild(cc); 4502 else 4503 addChild(cc); 4290 4504 4291 4505 #if CONFIG_DARWIN 4292 4506 // Any Mac OS-specific OSD stuff would go here. … … 4430 4644 VerticalConfigurationGroup* theme = new VerticalConfigurationGroup(false); 4431 4645 theme->setLabel(QObject::tr("Theme")); 4432 4646 4433 theme->addChild( newThemeSelector("Theme"));4647 theme->addChild(ThemeSelector("Theme")); 4434 4648 4435 4649 theme->addChild(ThemePainter()); 4436 4650 theme->addChild(MenuTheme()); -
programs/mythfrontend/main.cpp
34 34 #include "globalsettings.h" 35 35 #include "profilegroup.h" 36 36 #include "playgroup.h" 37 #include "playsettings.h" 37 38 #include "networkcontrol.h" 38 39 #include "DVDRingBuffer.h" 39 40 #include "scheduledrecording.h" … … 469 470 delete statusbox; 470 471 } 471 472 473 ConfigurationWizard *createPlaybackSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base) 474 { 475 return new PlaybackSettings(settings, base); 476 } 477 478 ConfigurationWizard *createOSDSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base) 479 { 480 return new OSDSettings(settings, base); 481 } 482 483 ConfigurationWizard *createMainGeneralSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base) 484 { 485 return new MainGeneralSettings(settings, base); 486 } 487 488 static PlayGroupEditor::SettingsLookup pbgroupSetup[] = { 489 createPlaybackSettingsForPlaybackGroup, 490 createOSDSettingsForPlaybackGroup, 491 createMainGeneralSettingsForPlaybackGroup 492 }; 493 472 494 void TVMenuCallback(void *data, QString &selection) 473 495 { 474 496 (void)data; … … 557 579 } 558 580 else if (sel == "settings playgroup") 559 581 { 560 PlayGroupEditor editor; 582 PlayGroupEditor editor(pbgroupSetup, 583 sizeof(pbgroupSetup)/sizeof(*pbgroupSetup)); 561 584 editor.exec(); 562 585 } 563 586 else if (sel == "settings general") … … 749 772 } 750 773 } 751 774 delete tmprbuf; 775 pginfo->SetPlaybackGroup("Videos"); 752 776 } 753 777 else if (pginfo->IsVideo()) 778 { 754 779 pos = pginfo->QueryBookmark(); 780 pginfo->SetPlaybackGroup("Videos"); 781 } 755 782 756 783 if (pos > 0) 757 784 { -
programs/mythfrontend/globalsettings.h
13 13 14 14 class QFileInfo; 15 15 class AudioDeviceComboBox; 16 class PlaySettings; 16 17 17 18 class AudioConfigSettings : public VerticalConfigurationGroup 18 19 { … … 88 89 class PlaybackSettings : public ConfigurationWizard 89 90 { 90 91 public: 91 PlaybackSettings(); 92 PlaybackSettings(PlaySettings *settings=NULL, 93 ConfigurationWizard *base=NULL); 92 94 }; 93 95 94 96 class OSDSettings: virtual public ConfigurationWizard 95 97 { 96 98 public: 97 OSDSettings(); 99 OSDSettings(PlaySettings *settings=NULL, 100 ConfigurationWizard *base=NULL); 98 101 }; 99 102 100 103 class GeneralSettings : public ConfigurationWizard … … 118 121 class MainGeneralSettings : public ConfigurationWizard 119 122 { 120 123 public: 121 MainGeneralSettings(); 124 MainGeneralSettings(PlaySettings *settings=NULL, 125 ConfigurationWizard *base=NULL); 122 126 }; 123 127 124 128 class GeneralRecPrioritiesSettings : public ConfigurationWizard … … 206 210 Q_OBJECT 207 211 208 212 public: 209 PlaybackProfileConfigs(const QString &str );213 PlaybackProfileConfigs(const QString &str, PlaySettings *settings); 210 214 virtual ~PlaybackProfileConfigs(); 211 215 212 216 private: … … 218 222 219 223 private: 220 224 QStringList profiles; 221 HostComboBox*grouptrigger;225 ComboBoxSetting *grouptrigger; 222 226 }; 223 227 224 228 #endif -
programs/mythavtest/main.cpp
20 20 #include "compat.h" 21 21 #include "mythuihelper.h" 22 22 #include "dbcheck.h" 23 #include "playsettings.h" 23 24 24 25 static void *run_priv_thread(void *data) 25 26 { … … 186 187 187 188 GetMythUI()->LoadQtConfig(); 188 189 189 #if defined(Q_OS_MACX)190 // Mac OS X doesn't define the AudioOutputDevice setting191 #else192 QString auddevice = gCoreContext->GetSetting("AudioOutputDevice");193 if (auddevice.isEmpty())194 {195 VERBOSE(VB_IMPORTANT, "Fatal Error: Audio not configured, you need "196 "to run 'mythfrontend', not 'mythtv'.");197 return TV_EXIT_NO_AUDIO;198 }199 #endif200 201 190 MythMainWindow *mainWindow = GetMythMainWindow(); 202 191 mainWindow->Init(); 203 192 … … 210 199 return GENERIC_EXIT_DB_OUTOFDATE; 211 200 } 212 201 213 TV *tv = new TV(); 202 QString playgroup(""); 203 if (!filename.isEmpty()) 204 { 205 ProgramInfo pg(filename); 206 playgroup = pg.GetPlaybackGroup(); 207 } 208 PlaySettings settings(playgroup); 209 210 #if defined(Q_OS_MACX) 211 // Mac OS X doesn't define the AudioOutputDevice setting 212 #else 213 QString auddevice = settings.GetSetting("AudioOutputDevice", ""); 214 if (auddevice.isEmpty()) 215 { 216 VERBOSE(VB_IMPORTANT, "Fatal Error: Audio not configured, you need " 217 "to run 'mythfrontend', not 'mythtv'."); 218 return TV_EXIT_NO_AUDIO; 219 } 220 #endif 221 222 TV *tv = new TV(&settings); 214 223 if (!tv->Init()) 215 224 { 216 225 VERBOSE(VB_IMPORTANT, "Fatal Error: Could not initialize TV class.");