Ticket #8088: 8088_playgroups_v11.patch
File 8088_playgroups_v11.patch, 168.2 KB (added by , 14 years ago) |
---|
-
libs/libmythtv/videoout_vdpau.h
16 16 { 17 17 public: 18 18 static void GetRenderOptions(render_opts &opts); 19 VideoOutputVDPAU( MythCodecID codec_id);19 VideoOutputVDPAU(PlaySettings *settings, MythCodecID codec_id); 20 20 ~VideoOutputVDPAU(); 21 21 bool Init(int width, int height, float aspect, WId winid, 22 22 int winx, int winy, int winw, int winh, WId embedid = 0); … … 49 49 const QSize &video_dim); 50 50 static MythCodecID GetBestSupportedCodec(uint width, uint height, 51 51 uint stream_type, 52 bool no_acceleration); 52 bool no_acceleration, 53 PlaySettings *settings); 53 54 DisplayInfo GetDisplayInfo(void); 54 55 virtual bool IsPIPSupported(void) const { return true; } 55 56 virtual bool IsPBPSupported(void) const { return false; } -
libs/libmythtv/NuppelVideoPlayer.cpp
62 62 #include "mythverbose.h" 63 63 #include "myth_imgconvert.h" 64 64 #include "mythsystemevent.h" 65 #include "playsettings.h" 65 66 66 67 extern "C" { 67 68 #include "vbitext/vbi.h" … … 227 228 // Debugging variables 228 229 output_jmeter(NULL) 229 230 { 230 231 // Playback (output) zoom control232 detect_letter_box = new DetectLetterbox(this);233 234 vbimode = VBIMode::Parse(gCoreContext->GetSetting("VbiFormat"));235 236 commrewindamount = gCoreContext->GetNumSetting("CommRewindAmount",0);237 commnotifyamount = gCoreContext->GetNumSetting("CommNotifyAmount",0);238 decode_extra_audio=gCoreContext->GetNumSetting("DecodeExtraAudio", 0);239 itvEnabled = gCoreContext->GetNumSetting("EnableMHEG", 0);240 db_prefer708 = gCoreContext->GetNumSetting("Prefer708Captions", 1);241 autocommercialskip = (CommSkipMode)242 gCoreContext->GetNumSetting("AutoCommercialSkip", kCommSkipOff);243 244 231 lastIgnoredManualSkip = QDateTime::currentDateTime().addSecs(-10); 245 232 246 233 bzero(&txtbuffers, sizeof(txtbuffers)); … … 672 659 673 660 if (using_null_videoout) 674 661 { 675 videoOutput = new VideoOutputNull( );662 videoOutput = new VideoOutputNull(GetPlaySettings()); 676 663 if (!videoOutput->Init(video_disp_dim.width(), video_disp_dim.height(), 677 664 video_aspect, 0, 0, 0, 0, 0, 0)) 678 665 { … … 720 707 pipState, 721 708 video_disp_dim, video_aspect, 722 709 widget->winId(), display_rect, (video_frame_rate * play_speed), 723 0 /*embedid*/ );710 0 /*embedid*/, GetPlaySettings()); 724 711 725 712 if (!videoOutput) 726 713 { … … 742 729 videoOutput->EmbedInWidget(embx, emby, embw, embh); 743 730 } 744 731 745 SetCaptionsEnabled(gCoreContext->GetNumSetting("DefaultCCMode"), false); 732 SetCaptionsEnabled(GetPlaySettings()->GetNumSetting("DefaultCCMode", 0), 733 false); 746 734 747 735 InitFilters(); 748 736 … … 793 781 794 782 void NuppelVideoPlayer::ReinitVideo(void) 795 783 { 796 if (!videoOutput->IsPreferredRenderer(video_disp_dim ))784 if (!videoOutput->IsPreferredRenderer(video_disp_dim, GetPlaySettings())) 797 785 { 798 786 VERBOSE(VB_PLAYBACK, LOC + QString("Need to switch video renderer.")); 799 787 SetErrored(QObject::tr("Need to switch video renderer.")); … … 861 849 862 850 if (!audioOutput && !using_null_videoout && player_ctx->IsAudioNeeded()) 863 851 { 864 bool setVolume = gCoreContext->GetNumSetting("MythControlsVolume", 1); 852 bool setVolume = 853 GetPlaySettings()->GetNumSetting("MythControlsVolume", 1); 865 854 audioOutput = AudioOutput::OpenAudio(audio_main_device, 866 855 audio_passthru_device, 867 856 audio_bits, audio_channels, 868 857 audio_codec, audio_samplerate, 869 858 AUDIOOUTPUT_VIDEO, 870 setVolume, audio_passthru); 859 setVolume, audio_passthru, 860 GetPlaySettings()); 871 861 if (!audioOutput) 872 862 errMsg = QObject::tr("Unable to create AudioOutput."); 873 863 else … … 899 889 if (audioOutput) 900 890 { 901 891 const AudioSettings settings(audio_bits, audio_channels, audio_codec, 902 audio_samplerate, audio_passthru); 892 audio_samplerate, audio_passthru, 893 GetPlaySettings()); 903 894 audioOutput->Reconfigure(settings); 904 895 if (audio_passthru) 905 896 audio_channels = 2; … … 2937 2928 m_double_process = videoOutput->IsExtraProcessingRequired(); 2938 2929 2939 2930 videosync = VideoSync::BestMethod( 2940 videoOutput, fr_int, rf_int, m_double_framerate); 2931 videoOutput, GetPlaySettings(), 2932 fr_int, rf_int, m_double_framerate); 2941 2933 2942 2934 // Make sure video sync can do it 2943 2935 if (videosync != NULL && m_double_framerate) … … 3421 3413 QRect visible, total; 3422 3414 float aspect, scaling; 3423 3415 3424 osd = new OSD( );3416 osd = new OSD(GetPlaySettings()); 3425 3417 3426 3418 osd->SetListener(m_tv); 3427 3419 … … 3500 3492 3501 3493 GetDecoder()->setExactSeeks(seeks); 3502 3494 3503 if ( gCoreContext->GetNumSetting("ClearSavedPosition", 1) &&3495 if (GetPlaySettings()->GetNumSetting("ClearSavedPosition", 1) && 3504 3496 !player_ctx->IsPIP()) 3505 3497 { 3506 3498 if (player_ctx->buffer->isDVD()) … … 3768 3760 ++deleteIter; 3769 3761 if (deleteIter.key() == totalFrames) 3770 3762 { 3771 if (!( gCoreContext->GetNumSetting("EndOfRecordingExitPrompt") == 13763 if (!(GetPlaySettings()->GetNumSetting("EndOfRecordingExitPrompt", 0) == 1 3772 3764 && !player_ctx->IsPIP() && 3773 3765 player_ctx->GetState() == kState_WatchingPreRecorded)) 3774 3766 { … … 3942 3934 3943 3935 if (sim_pip_players.isEmpty()) 3944 3936 { 3945 return (PIPLocation)gCoreContext->GetNumSetting("PIPLocation", kPIPTopLeft); 3937 return (PIPLocation)GetPlaySettings()->GetNumSetting("PIPLocation", 3938 kPIPTopLeft); 3946 3939 } 3947 3940 3948 3941 // order of preference, could be stored in db if we want it configurable … … 4733 4726 exactseeks = frame_exact_seek; 4734 4727 player_ctx = ctx; 4735 4728 livetv = ctx->tvchain; 4729 4730 vbimode = VBIMode::Parse(GetPlaySettings()->GetSetting("VbiFormat", "")); 4731 4732 // Playback (output) zoom control 4733 detect_letter_box = new DetectLetterbox(this); 4734 4735 commrewindamount = GetPlaySettings()->GetNumSetting("CommRewindAmount", 0); 4736 commnotifyamount = GetPlaySettings()->GetNumSetting("CommNotifyAmount", 0); 4737 decode_extra_audio = GetPlaySettings()->GetNumSetting("DecodeExtraAudio", 0); 4738 itvEnabled = GetPlaySettings()->GetNumSetting("EnableMHEG", 0); 4739 db_prefer708 = GetPlaySettings()->GetNumSetting("Prefer708Captions", 1); 4740 autocommercialskip = (CommSkipMode) 4741 GetPlaySettings()->GetNumSetting("AutoCommercialSkip", kCommSkipOff); 4742 SetAudioInfo(GetPlaySettings()->GetSetting("AudioOutputDevice", ""), 4743 GetPlaySettings()->GetSetting("PassThruOutputDevice", ""), 4744 gCoreContext->GetNumSetting("AudioSampleRate", 44100)); 4736 4745 } 4737 4746 4738 4747 void NuppelVideoPlayer::SetDeleteIter(void) … … 7404 7413 { 7405 7414 QMutexLocker locker(&subtitleLock); 7406 7415 textSubtitles.Clear(); 7407 return TextSubtitleParser::LoadSubtitles(subtitleFileName, textSubtitles); 7416 return TextSubtitleParser::LoadSubtitles(subtitleFileName, textSubtitles, 7417 GetPlaySettings()); 7408 7418 } 7409 7419 7410 7420 void NuppelVideoPlayer::ChangeDVDTrack(bool ffw) -
libs/libmythtv/videooutwindow.cpp
30 30 #include "videooutwindow.h" 31 31 #include "osd.h" 32 32 #include "osdsurface.h" 33 #include "playsettings.h" 33 34 #include "NuppelVideoPlayer.h" 34 35 #include "videodisplayprofile.h" 35 36 #include "decoderbase.h" … … 54 55 const float VideoOutWindow::kManualZoomMinVerticalZoom = 0.5f; 55 56 const int VideoOutWindow::kManualZoomMaxMove = 50; 56 57 57 VideoOutWindow::VideoOutWindow( ) :58 VideoOutWindow::VideoOutWindow(PlaySettings *_settings) : 58 59 // DB settings 59 60 db_move(0, 0), db_scale_horiz(0.0f), db_scale_vert(0.0f), 60 61 db_pip_size(26), … … 85 86 86 87 // Various state variables 87 88 embedding(false), needrepaint(false), 88 allowpreviewepg(true), pip_state(kPIPOff) 89 allowpreviewepg(true), pip_state(kPIPOff), 90 91 settings(_settings) 89 92 { 90 93 db_pip_size = gCoreContext->GetNumSetting("PIPSize", 26); 91 94 92 db_move = QPoint( gCoreContext->GetNumSetting("xScanDisplacement", 0),93 gCoreContext->GetNumSetting("yScanDisplacement", 0));95 db_move = QPoint(settings->GetNumSetting("xScanDisplacement", 0), 96 settings->GetNumSetting("yScanDisplacement", 0)); 94 97 db_use_gui_size = gCoreContext->GetNumSetting("GuiSizeForTV", 0); 95 98 96 99 QDesktopWidget *desktop = NULL; … … 613 616 if (change) 614 617 { 615 618 db_scale_vert = 616 gCoreContext->GetNumSetting("VertScanPercentage", 0) * 0.01f;619 settings->GetNumSetting("VertScanPercentage", 0) * 0.01f; 617 620 db_scale_horiz = 618 gCoreContext->GetNumSetting("HorizScanPercentage", 0) * 0.01f;621 settings->GetNumSetting("HorizScanPercentage", 0) * 0.01f; 619 622 db_scaling_allowed = true; 620 623 } 621 624 else -
libs/libmythtv/videoout_d3d.cpp
948 948 opts.priorities->insert("direct3d", 55); 949 949 } 950 950 951 VideoOutputD3D::VideoOutputD3D( void)952 : VideoOutput( ), m_lock(QMutex::Recursive),951 VideoOutputD3D::VideoOutputD3D(PlaySettings *settings) 952 : VideoOutput(settings), m_lock(QMutex::Recursive), 953 953 m_hWnd(NULL), m_ctx(NULL), 954 954 m_video(NULL), m_osd(NULL), 955 955 m_d3d_osd(false), m_osd_ready(false), -
libs/libmythtv/DetectLetterbox.cpp
5 5 #include "NuppelVideoPlayer.h" 6 6 #include "videoouttypes.h" 7 7 #include "mythcorecontext.h" 8 #include "playsettings.h" 8 9 9 10 DetectLetterbox::DetectLetterbox(NuppelVideoPlayer* const nvp) 10 11 { 11 int dbAdjustFill = gCoreContext->GetNumSetting("AdjustFill", 0);12 int dbAdjustFill = nvp->GetPlaySettings()->GetNumSetting("AdjustFill", 0); 12 13 isDetectLetterbox = dbAdjustFill >= kAdjustFill_AutoDetect_DefaultOff; 13 14 firstFrameChecked = 0; 14 15 detectLetterboxDefaultMode = (AdjustFillMode) max((int) kAdjustFill_Off, … … 17 18 detectLetterboxPossibleHalfFrame = -1; 18 19 detectLetterboxPossibleFullFrame = -1; 19 20 detectLetterboxDetectedMode = nvp->GetAdjustFill(); 20 detectLetterboxLimit = gCoreContext->GetNumSetting("DetectLeterboxLimit", 75); 21 detectLetterboxLimit = 22 nvp->GetPlaySettings()->GetNumSetting("DetectLeterboxLimit", 75); 21 23 nupple_video_player = nvp; 22 24 } 23 25 -
libs/libmythtv/videoout_opengl.cpp
38 38 opts.priorities->insert("opengl", 65); 39 39 } 40 40 41 VideoOutputOpenGL::VideoOutputOpenGL( void)42 : VideoOutput( ),41 VideoOutputOpenGL::VideoOutputOpenGL(PlaySettings *settings) 42 : VideoOutput(settings), 43 43 gl_context_lock(QMutex::Recursive), 44 44 gl_context(NULL), gl_videochain(NULL), 45 45 gl_osdchain(NULL), gl_pipchain_active(NULL), -
libs/libmythtv/videoout_quartz.cpp
65 65 #include "videodisplayprofile.h" 66 66 #include "videoout_dvdv.h" 67 67 68 class PlaySettings; 69 68 70 #define LOC QString("VideoOutputQuartz::") 69 71 #define LOC_ERR QString("VideoOutputQuartz Error: ") 70 72 … … 1108 1110 /** \class VideoOutputQuartz 1109 1111 * \brief Implementation of Quartz (Mac OS X windowing system) video output 1110 1112 */ 1111 VideoOutputQuartz::VideoOutputQuartz( 1113 VideoOutputQuartz::VideoOutputQuartz(PlaySettings *settings 1112 1114 MythCodecID _myth_codec_id, void *codec_priv) : 1113 VideoOutput( ), Started(false), data(new QuartzData()),1115 VideoOutput(settings), Started(false), data(new QuartzData()), 1114 1116 myth_codec_id(_myth_codec_id) 1115 1117 { 1116 1118 init(&pauseFrame, FMT_YV12, NULL, 0, 0, 0, 0); … … 1816 1818 MythCodecID VideoOutputQuartz::GetBestSupportedCodec( 1817 1819 uint width, uint height, 1818 1820 uint osd_width, uint osd_height, 1819 uint stream_type, uint fourcc )1821 uint stream_type, uint fourcc, PlaySettings *settings) 1820 1822 { 1821 1823 (void) osd_width; 1822 1824 (void) osd_height; 1823 1825 1824 VideoDisplayProfile vdp ;1826 VideoDisplayProfile vdp(settings); 1825 1827 vdp.SetInput(QSize(width, height)); 1826 1828 QString dec = vdp.GetDecoder(); 1827 1829 if ((dec == "libmpeg2") || (dec == "ffmpeg")) -
libs/libmythtv/avformatdecoder.cpp
27 27 #include "DVDRingBuffer.h" 28 28 #include "videodisplayprofile.h" 29 29 #include "mythuihelper.h" 30 #include "playsettings.h" 30 31 31 32 #include "lcddevice.h" 32 33 … … 517 518 av_log_set_level((debug) ? AV_LOG_DEBUG : AV_LOG_ERROR); 518 519 av_log_set_callback(myth_av_log); 519 520 520 max_channels = (uint) gCoreContext->GetNumSetting("MaxChannels", 2); 521 allow_ac3_passthru = (max_channels > 2) ? gCoreContext->GetNumSetting("AC3PassThru", false) : false; 522 allow_dts_passthru = (max_channels > 2) ? gCoreContext->GetNumSetting("DTSPassThru", false) : false; 523 internal_vol = gCoreContext->GetNumSetting("MythControlsVolume", 0); 521 max_channels = 522 (uint) GetNVP()->GetPlaySettings()->GetNumSetting("MaxChannels", 2); 523 allow_ac3_passthru = (max_channels > 2) ? 524 GetNVP()->GetPlaySettings()->GetNumSetting("AC3PassThru", false) : 525 false; 526 allow_dts_passthru = (max_channels > 2) ? 527 GetNVP()->GetPlaySettings()->GetNumSetting("DTSPassThru", false) : 528 false; 529 internal_vol = 530 GetNVP()->GetPlaySettings()->GetNumSetting("MythControlsVolume", 0); 524 531 525 532 audioIn.sample_size = -32; // force SetupAudioStream to run once 526 533 itv = GetNVP()->GetInteractiveTV(); 527 534 528 535 cc608_build_parity_table(cc608_parity_table); 529 536 530 if ( gCoreContext->GetNumSetting("CCBackground", 0))537 if (GetNVP()->GetPlaySettings()->GetNumSetting("CCBackground", 0)) 531 538 CC708Window::forceWhiteOnBlackText = true; 532 539 533 540 no_dts_hack = false; … … 1427 1434 { 1428 1435 directrendering = true; 1429 1436 if ( 1430 ! gCoreContext->GetNumSetting("DecodeExtraAudio", 0) &&1437 !GetNVP()->GetPlaySettings()->GetNumSetting("DecodeExtraAudio", 0) && 1431 1438 !CODEC_IS_HWACCEL(codec)) 1432 1439 { 1433 1440 SetLowBuffers(false); … … 1907 1914 1908 1915 if (!is_db_ignored) 1909 1916 { 1910 VideoDisplayProfile vdp ;1917 VideoDisplayProfile vdp(GetNVP()->GetPlaySettings()); 1911 1918 vdp.SetInput(QSize(width, height)); 1912 1919 dec = vdp.GetDecoder(); 1913 1920 thread_count = vdp.GetMaxCPUs(); … … 1935 1942 MythCodecID vdpau_mcid; 1936 1943 vdpau_mcid = VideoOutputVDPAU::GetBestSupportedCodec( 1937 1944 width, height, 1938 mpeg_version(enc->codec_id), no_hardware_decoders); 1945 mpeg_version(enc->codec_id), no_hardware_decoders, 1946 GetNVP()->GetPlaySettings()); 1939 1947 1940 1948 if (vdpau_mcid >= video_codec_id) 1941 1949 { … … 1967 1975 /* mpeg type */ mpeg_version(enc->codec_id), 1968 1976 /* xvmc pix fmt */ xvmc_pixel_format(enc->pix_fmt), 1969 1977 /* test surface */ codec_is_std(video_codec_id), 1970 /* force_xv */ force_xv); 1978 /* force_xv */ force_xv, 1979 GetNVP()->GetPlaySettings()); 1971 1980 1972 1981 if (mcid >= video_codec_id) 1973 1982 { … … 2000 2009 /* osd dim */ 0, 0, 2001 2010 /* mpeg type */ mpeg_version(enc->codec_id), 2002 2011 /* pixel format */ 2003 (PIX_FMT_YUV420P == enc->pix_fmt) ? FOURCC_I420 : 0); 2012 (PIX_FMT_YUV420P == enc->pix_fmt) ? FOURCC_I420 : 0, 2013 GetNVP()->GetPlaySettings()); 2004 2014 2005 2015 if (quartz_mcid >= video_codec_id) 2006 2016 { -
libs/libmythtv/osdtypes.cpp
18 18 #include "mythcontext.h" 19 19 #include "mythdialogs.h" 20 20 #include "mythverbose.h" 21 #include "playsettings.h" 21 22 22 23 #ifdef USING_FRIBIDI 23 24 #include "fribidi/fribidi.h" … … 2359 2360 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2360 2361 2361 2362 OSDTypeCC::OSDTypeCC(const QString &name, TTFFont *font, int xoff, int yoff, 2362 int dispw, int disph, float wmult, float hmult) 2363 int dispw, int disph, float wmult, float hmult, 2364 PlaySettings *settings) 2363 2365 : OSDType(name) 2364 2366 { 2365 2367 m_font = font; … … 2373 2375 2374 2376 QRect rect = QRect(0, 0, 0, 0); 2375 2377 m_box = new OSDTypeBox("cc_background", rect, wmult, hmult); 2376 m_ccbackground = gCoreContext->GetNumSetting("CCBackground", 0);2378 m_ccbackground = settings->GetNumSetting("CCBackground", 0); 2377 2379 } 2378 2380 2379 2381 OSDTypeCC::~OSDTypeCC() -
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/osdtypes.h
31 31 class OSDTypeText; 32 32 class OSDSurface; 33 33 class TV; 34 class PlaySettings; 34 35 35 36 typedef QHash<QString,QString> InfoMap; 36 37 typedef QMap<int,uint> HotKeyMap; … … 573 574 { 574 575 public: 575 576 OSDTypeCC(const QString &name, TTFFont *font, int xoff, int yoff, 576 int dispw, int disph, float wmult, float hmult); 577 int dispw, int disph, float wmult, float hmult, 578 PlaySettings *settings); 577 579 ~OSDTypeCC(); 578 580 579 581 void Reinit(float wmult, float hmult); -
libs/libmythtv/tv_play.h
55 55 class TV; 56 56 class OSDListTreeItemEnteredEvent; 57 57 class OSDListTreeItemSelectedEvent; 58 class PlaySettings; 58 59 59 60 typedef QMap<QString,InfoMap> DDValueMap; 60 61 typedef QMap<QString,DDValueMap> DDKeyMap; … … 185 186 unsigned long seconds; 186 187 }; 187 188 188 TV( void);189 TV(PlaySettings *settings); 189 190 ~TV(); 190 191 191 192 bool Init(bool createWindow = true); … … 210 211 211 212 // Recording commands 212 213 int PlayFromRecorder(int recordernum); 213 int Playback(const ProgramInfo &rcinfo );214 int Playback(const ProgramInfo &rcinfo, PlaySettings *settings); 214 215 215 216 // Commands used by frontend playback box 216 217 QString GetRecordingGroup(int player_idx) const; … … 599 600 static TVState RemoveRecording(TVState state); 600 601 void RestoreScreenSaver(const PlayerContext*); 601 602 602 void InitUDPNotifyEvent( void);603 void InitUDPNotifyEvent(PlaySettings *settings); 603 604 604 605 /// true if dialog is either videoplayexit, playexit or askdelete dialog 605 606 bool IsVideoExitDialog(const QString &dialog_name); -
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
3566 3566 3567 3567 VideoDisplayProfile::CreateNewProfiles(host); 3568 3568 profiles = VideoDisplayProfile::GetProfiles(host); 3569 QString profile = VideoDisplayProfile::GetDefaultProfileName(host); 3569 QString profile = 3570 VideoDisplayProfile::GetDefaultProfileName(host, NULL); 3570 3571 3571 3572 if (profiles.contains("Normal") && 3572 3573 (profile=="CPU++" || profile=="CPU+" || profile=="CPU--")) … … 5668 5669 " jump int(11) NOT NULL default '0'," 5669 5670 " PRIMARY KEY (`name`)" 5670 5671 ");", 5672 "CREATE TABLE playgroupsettings (" 5673 " playgroupname varchar(64) NOT NULL," 5674 " `value` varchar(128) NOT NULL," 5675 " `data` text," 5676 " overridden tinyint(1) NOT NULL," 5677 " PRIMARY KEY (playgroupname, `value`)" 5678 ");", 5671 5679 "CREATE TABLE powerpriority (" 5672 5680 " priorityname varchar(64) collate utf8_bin NOT NULL," 5673 5681 " recpriority int(10) NOT NULL default '0'," -
libs/libmythtv/videoout_vdpau.cpp
46 46 opts.deints->insert("vdpau", deints); 47 47 } 48 48 49 VideoOutputVDPAU::VideoOutputVDPAU( MythCodecID codec_id)50 : VideoOutput( ),49 VideoOutputVDPAU::VideoOutputVDPAU(PlaySettings *settings, MythCodecID codec_id) 50 : VideoOutput(settings), 51 51 m_codec_id(codec_id), m_win(0), m_render(NULL), 52 52 m_buffer_size(NUM_VDPAU_BUFFERS), m_pause_surface(0), 53 53 m_need_deintrefs(false), m_video_mixer(0), m_mixer_features(kVDPFeatNone), … … 858 858 859 859 MythCodecID VideoOutputVDPAU::GetBestSupportedCodec( 860 860 uint width, uint height, 861 uint stream_type, bool no_acceleration )861 uint stream_type, bool no_acceleration, PlaySettings *settings) 862 862 { 863 863 bool use_cpu = no_acceleration; 864 VideoDisplayProfile vdp ;864 VideoDisplayProfile vdp(settings); 865 865 vdp.SetInput(QSize(width, height)); 866 866 QString dec = vdp.GetDecoder(); 867 867 -
libs/libmythtv/videoout_directfb.cpp
274 274 opts.priorities->insert("directfb", 60); 275 275 } 276 276 277 VideoOutputDirectfb::VideoOutputDirectfb( void)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/videoout_d3d.h
93 93 { 94 94 public: 95 95 static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); 96 VideoOutputD3D( );96 VideoOutputD3D(PlaySettings *settings); 97 97 ~VideoOutputD3D(); 98 98 99 99 bool Init(int width, int height, float aspect, WId winid, -
libs/libmythtv/playercontext.cpp
15 15 #include "storagegroup.h" 16 16 #include "mythcorecontext.h" 17 17 #include "videometadatautil.h" 18 #include "DetectLetterbox.h" 19 #include "playsettings.h" 18 20 19 21 #define LOC QString("playCtx: ") 20 22 #define LOC_ERR QString("playCtx, Error: ") … … 435 437 WId embedwinid, const QRect *embedbounds, 436 438 bool muted) 437 439 { 438 int exact_seeking = gCoreContext->GetNumSetting("ExactSeeking", 0);440 int exact_seeking = settings->GetNumSetting("ExactSeeking", 0); 439 441 440 442 if (HasNVP()) 441 443 { … … 450 452 _nvp->DisableHardwareDecoders(); 451 453 452 454 _nvp->SetPlayerInfo(tv, widget, exact_seeking, this); 453 _nvp->SetAudioInfo(gCoreContext->GetSetting("AudioOutputDevice"),454 gCoreContext->GetSetting("PassThruOutputDevice"),455 gCoreContext->GetNumSetting("AudioSampleRate", 44100));456 455 _nvp->SetAudioStretchFactor(ts_normal); 457 456 _nvp->SetLength(playingLen); 458 457 … … 913 912 /** 914 913 * \brief assign programinfo to the context 915 914 */ 916 void PlayerContext::SetPlayingInfo(const ProgramInfo *info) 915 void PlayerContext::SetPlayingInfo(const ProgramInfo *info, 916 PlaySettings *_settings) 917 917 { 918 918 bool ignoreDB = gCoreContext->IsDatabaseIgnored(); 919 919 … … 925 925 playingInfo->MarkAsInUse(false, recUsage); 926 926 delete playingInfo; 927 927 playingInfo = NULL; 928 // XXX delete settings? 928 929 } 929 930 930 931 if (info) … … 933 934 if (!ignoreDB) 934 935 playingInfo->MarkAsInUse(true, recUsage); 935 936 playingLen = playingInfo->GetSecondsInRecording(); 937 settings = (_settings ? _settings : 938 new PlaySettings(playingInfo->GetPlaybackGroup())); 936 939 } 937 940 } 938 941 -
libs/libmythtv/NuppelVideoPlayer.h
196 196 bool GetAudioBufferStatus(uint &fill, uint &total) const; 197 197 PIPLocation GetNextPIPLocation(void) const; 198 198 199 PlaySettings *GetPlaySettings(void) const { 200 return player_ctx ? player_ctx->settings : NULL; 201 } 202 199 203 // Bool Gets 200 204 bool GetRawAudioState(void) const; 201 205 bool GetLimitKeyRepeat(void) const { return limitKeyRepeat; } -
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: … … 75 77 class TextSubtitleParser 76 78 { 77 79 public: 78 static bool LoadSubtitles(QString fileName, TextSubtitles &target); 80 static bool LoadSubtitles(QString fileName, TextSubtitles &target, 81 PlaySettings *settings); 79 82 }; 80 83 81 84 #endif -
libs/libmythtv/osd.h
73 73 class TeletextViewer; 74 74 class QStringList; 75 75 class QDomElement; 76 class PlaySettings; 76 77 77 78 class OSD : public QObject 78 79 { 79 80 Q_OBJECT 80 81 public: 81 OSD( );82 OSD(PlaySettings *settings); 82 83 ~OSD(void); 83 84 84 85 void Init(const QRect &totalBounds, int frameRate, … … 236 237 237 238 QObject *m_listener; 238 239 240 PlaySettings *settings; 241 239 242 QRect osdBounds; 240 243 int frameint; 241 244 bool needPillarBox; -
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" … … 76 77 * \brief Returns the most sophisticated video sync method available. 77 78 */ 78 79 VideoSync *VideoSync::BestMethod(VideoOutput *video_output, 80 PlaySettings *settings, 79 81 uint frame_interval, uint refresh_interval, 80 82 bool halve_frame_interval) 81 83 { 82 84 VideoSync *trial = NULL; 83 85 tryingVideoSync = true; 84 bool tryOpenGL = ( gCoreContext->GetNumSetting("UseOpenGLVSync", 1) &&86 bool tryOpenGL = (settings->GetNumSetting("UseOpenGLVSync", 1) && 85 87 (getenv("NO_OPENGL_VSYNC") == NULL)); 86 88 87 89 // m_forceskip allows for skipping one sync method -
libs/libmythtv/tv_play.cpp
61 61 #include "recordinginfo.h" 62 62 #include "mythsystemevent.h" 63 63 #include "videometadatautil.h" 64 #include "playsettings.h" 64 65 65 66 #if ! HAVE_ROUND 66 67 #define round(x) ((int) ((x) + 0.5)) … … 193 194 bool startInGuide = flags & kStartTVInGuide; 194 195 bool inPlaylist = flags & kStartTVInPlayList; 195 196 bool initByNetworkCommand = flags & kStartTVByNetworkCommand; 196 TV *tv = new TV();197 197 bool quitAll = false; 198 198 bool showDialogs = true; 199 199 bool playCompleted = false; … … 208 208 curProgram->SetIgnoreBookmark(flags & kStartTVIgnoreBookmark); 209 209 } 210 210 211 PlaySettings settings(curProgram ? curProgram->GetPlaybackGroup() : "Default"); 212 TV *tv = new TV(&settings); 213 211 214 // Initialize TV 212 215 if (!tv->Init()) 213 216 { … … 238 241 if (curProgram) 239 242 { 240 243 VERBOSE(VB_PLAYBACK, LOC + "tv->Playback() -- begin"); 241 if (!tv->Playback(*curProgram ))244 if (!tv->Playback(*curProgram, &settings)) 242 245 { 243 246 quitAll = true; 244 247 } … … 807 810 * \brief Performs instance initialiation not requiring access to database. 808 811 * \sa Init(void) 809 812 */ 810 TV::TV( void)813 TV::TV(PlaySettings *settings) 811 814 : // Configuration variables from database 812 815 baseFilters(""), 813 816 db_channel_format("<num> <sign>"), … … 944 947 kv[QString("FFRewSpeed%1").arg(i)] = QString::number(ff_rew_def[i]); 945 948 946 949 MythDB::getMythDB()->GetSettings(kv); 950 settings->AddToMap(kv); 947 951 948 952 // convert from minutes to ms. 949 953 db_idle_timeout = kv["LiveTVIdleTimeout"].toInt() * 60 * 1000; … … 1738 1742 } 1739 1743 1740 1744 1741 int TV::Playback(const ProgramInfo &rcinfo )1745 int TV::Playback(const ProgramInfo &rcinfo, PlaySettings *settings) 1742 1746 { 1743 1747 wantsToQuit = false; 1744 1748 jumpToProgram = false; … … 1752 1756 return 0; 1753 1757 } 1754 1758 1755 mctx->SetPlayingInfo(&rcinfo );1759 mctx->SetPlayingInfo(&rcinfo, settings); 1756 1760 mctx->SetInitialTVState(false); 1757 1761 ScheduleStateChange(mctx); 1758 1762 … … 1835 1839 1836 1840 if (fileexists) 1837 1841 { 1838 Playback(pginfo); 1842 PlaySettings settings("Default"); 1843 Playback(pginfo, &settings); 1839 1844 retval = 1; 1840 1845 } 1841 1846 … … 2181 2186 { 2182 2187 OSD *osd = GetOSDLock(ctx); 2183 2188 ctx->LockPlayingInfo(__FILE__, __LINE__); 2184 if (osd && (PlayGroup::GetCount() > 0)) 2189 if (ctx->playingInfo->GetPlaybackGroup() != "Default" && 2190 ctx->playingInfo->GetPlaybackGroup() != "Videos" && 2191 osd && (PlayGroup::GetCount() > 0)) 2185 2192 osd->SetSettingsText(tr("%1 Settings") 2186 2193 .arg(tv_i18n(ctx->playingInfo->GetPlaybackGroup())), 3); 2187 2194 ctx->UnlockPlayingInfo(__FILE__, __LINE__); … … 5196 5203 return false; 5197 5204 } 5198 5205 5199 InitUDPNotifyEvent( );5206 InitUDPNotifyEvent(ctx->settings); 5200 5207 bool ok = false; 5201 5208 if (ctx->IsNullVideoDesired()) 5202 5209 { … … 11907 11914 GetMythUI()->RestoreScreensaver(); 11908 11915 } 11909 11916 11910 void TV::InitUDPNotifyEvent( void)11917 void TV::InitUDPNotifyEvent(PlaySettings *settings) 11911 11918 { 11912 11919 if (db_udpnotify_port && !udpnotify) 11913 11920 { 11914 udpnotify = new UDPNotify(db_udpnotify_port );11921 udpnotify = new UDPNotify(db_udpnotify_port, settings); 11915 11922 connect(udpnotify, 11916 11923 SIGNAL(AddUDPNotifyEvent( 11917 11924 const QString&,const UDPNotifyOSDSet*)), -
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( void) :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
8 8 #include "NuppelVideoPlayer.h" 9 9 #include "videodisplayprofile.h" 10 10 #include "decoderbase.h" 11 #include "playsettings.h" 11 12 12 13 #include "mythcorecontext.h" 13 14 #include "mythverbose.h" … … 108 109 PIPState pipState, 109 110 const QSize &video_dim, float video_aspect, 110 111 WId win_id, const QRect &display_rect, 111 float video_prate, WId embed_id) 112 float video_prate, WId embed_id, 113 PlaySettings *settings) 112 114 { 113 115 (void) codec_priv; 114 116 … … 153 155 QString renderer = QString::null; 154 156 if (renderers.size() > 0) 155 157 { 156 VideoDisplayProfile vprof ;158 VideoDisplayProfile vprof(settings); 157 159 vprof.SetInput(video_dim); 158 160 159 161 QString tmp = vprof.GetVideoRenderer(); … … 181 183 182 184 #ifdef USING_DIRECTFB 183 185 if (renderer == "directfb") 184 vo = new VideoOutputDirectfb( );186 vo = new VideoOutputDirectfb(settings); 185 187 #endif // USING_DIRECTFB 186 188 187 189 #ifdef USING_MINGW 188 190 if (renderer == "direct3d") 189 vo = new VideoOutputD3D( );191 vo = new VideoOutputD3D(settings); 190 192 #endif // USING_MINGW 191 193 192 194 #ifdef Q_OS_MACX 193 195 if (osxlist.contains(renderer)) 194 vo = new VideoOutputQuartz( codec_id, codec_priv);196 vo = new VideoOutputQuartz(settings, codec_id, codec_priv); 195 197 #endif // Q_OS_MACX 196 198 197 199 #ifdef USING_OPENGL_VIDEO 198 200 if (renderer == "opengl") 199 vo = new VideoOutputOpenGL( );201 vo = new VideoOutputOpenGL(settings); 200 202 #endif // USING_OPENGL_VIDEO 201 203 202 204 #ifdef USING_VDPAU 203 205 if (renderer == "vdpau") 204 vo = new VideoOutputVDPAU( codec_id);206 vo = new VideoOutputVDPAU(settings, codec_id); 205 207 #endif // USING_VDPAU 206 208 207 209 #ifdef USING_XV 208 210 if (xvlist.contains(renderer)) 209 vo = new VideoOutputXv( codec_id);211 vo = new VideoOutputXv(settings, codec_id); 210 212 #endif // USING_XV 211 213 212 214 if (vo) … … 303 305 * \brief This constructor for VideoOutput must be followed by an 304 306 * Init(int,int,float,WId,int,int,int,int,WId) call. 305 307 */ 306 VideoOutput::VideoOutput( ) :308 VideoOutput::VideoOutput(PlaySettings *_settings) : 307 309 // DB Settings 308 310 db_display_dim(0,0), 309 311 db_aspectoverride(kAspect_Off), db_adjustfill(kAdjustFill_Off), … … 337 339 display_res(NULL), 338 340 339 341 // Physical display 340 monitor_sz(640,480), monitor_dim(400,300) 342 monitor_sz(640,480), monitor_dim(400,300), 341 343 344 settings(_settings) 345 342 346 { 343 347 bzero(&pip_tmp_image, sizeof(pip_tmp_image)); 344 db_display_dim = QSize( gCoreContext->GetNumSetting("DisplaySizeWidth", 0),345 gCoreContext->GetNumSetting("DisplaySizeHeight", 0));348 db_display_dim = QSize(settings->GetNumSetting("DisplaySizeWidth", 0), 349 settings->GetNumSetting("DisplaySizeHeight", 0)); 346 350 347 351 db_pict_attr[kPictureAttribute_Brightness] = 348 gCoreContext->GetNumSetting("PlaybackBrightness", 50);352 settings->GetNumSetting("PlaybackBrightness", 50); 349 353 db_pict_attr[kPictureAttribute_Contrast] = 350 gCoreContext->GetNumSetting("PlaybackContrast", 50);354 settings->GetNumSetting("PlaybackContrast", 50); 351 355 db_pict_attr[kPictureAttribute_Colour] = 352 gCoreContext->GetNumSetting("PlaybackColour", 50);356 settings->GetNumSetting("PlaybackColour", 50); 353 357 db_pict_attr[kPictureAttribute_Hue] = 354 gCoreContext->GetNumSetting("PlaybackHue", 0);358 settings->GetNumSetting("PlaybackHue", 0); 355 359 356 360 db_aspectoverride = (AspectOverrideMode) 357 gCoreContext->GetNumSetting("AspectOverride", 0);361 settings->GetNumSetting("AspectOverride", 0); 358 362 db_adjustfill = (AdjustFillMode) 359 gCoreContext->GetNumSetting("AdjustFill", 0);363 settings->GetNumSetting("AdjustFill", 0); 360 364 db_letterbox_colour = (LetterBoxColour) 361 gCoreContext->GetNumSetting("LetterboxColour", 0);365 settings->GetNumSetting("LetterboxColour", 0); 362 366 db_use_picture_controls = 363 gCoreContext->GetNumSetting("UseOutputPictureControls", 0);367 settings->GetNumSetting("UseOutputPictureControls", 0); 364 368 365 369 if (!gCoreContext->IsDatabaseIgnored()) 366 db_vdisp_profile = new VideoDisplayProfile( );370 db_vdisp_profile = new VideoDisplayProfile(settings); 367 371 368 windows.push_back(VideoOutWindow( ));372 windows.push_back(VideoOutWindow(settings)); 369 373 } 370 374 371 375 /** … … 434 438 return QString::null; 435 439 } 436 440 437 bool VideoOutput::IsPreferredRenderer(QSize video_size )441 bool VideoOutput::IsPreferredRenderer(QSize video_size, PlaySettings *settings) 438 442 { 439 443 if (!db_vdisp_profile || (video_size == windows[0].GetVideoDispDim())) 440 444 return true; 441 445 442 VideoDisplayProfile vdisp ;446 VideoDisplayProfile vdisp(settings); 443 447 vdisp.SetInput(video_size); 444 448 QString new_rend = vdisp.GetVideoRenderer(); 445 449 if (new_rend.isEmpty()) -
libs/libmythtv/videooutwindow.h
16 16 #include "videoouttypes.h" 17 17 18 18 class NuppelVideoPlayer; 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
27 27 class LiveTVChain; 28 28 class MythDialog; 29 29 class QPainter; 30 class PlaySettings; 30 31 31 32 typedef enum 32 33 { … … 90 91 void SetRecorder(RemoteEncoder *rec); 91 92 void SetTVChain(LiveTVChain *chain); 92 93 void SetRingBuffer(RingBuffer *buf); 93 void SetPlayingInfo(const ProgramInfo *info );94 void SetPlayingInfo(const ProgramInfo *info, PlaySettings *settings=NULL); 94 95 void SetPlayGroup(const QString &group); 95 96 void SetPseudoLiveTV(const ProgramInfo *pi, PseudoState new_state); 96 97 void SetPIPLocation(int loc) { pipLocation = loc; } … … 146 147 LiveTVChain *tvchain; 147 148 RingBuffer *buffer; 148 149 ProgramInfo *playingInfo; ///< Currently playing info 150 PlaySettings *settings; // corresponding to playingInfo 149 151 long long playingLen; ///< Initial CalculateLength() 150 152 bool nohardwaredecoders; // < Disable use of VDPAU decoding 151 153 bool decoding; ///< Video decoder thread started -
libs/libmythtv/vsync.h
101 101 102 102 // documented in vsync.cpp 103 103 static VideoSync *BestMethod(VideoOutput*, 104 PlaySettings *settings, 104 105 uint frame_interval, uint refresh_interval, 105 106 bool interlaced); 106 107 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( MythCodecID av_codec_id);54 VideoOutputXv(PlaySettings *settings, MythCodecID av_codec_id); 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
166 166 * \see VideoOutput, VideoBuffers 167 167 * 168 168 */ 169 VideoOutputXv::VideoOutputXv( MythCodecID codec_id)170 : VideoOutput( ),169 VideoOutputXv::VideoOutputXv(PlaySettings *settings, MythCodecID codec_id) 170 : VideoOutput(settings), 171 171 myth_codec_id(codec_id), video_output_subtype(XVUnknown), 172 172 global_lock(QMutex::Recursive), 173 173 … … 408 408 * \return port number if it succeeds, else -1. 409 409 */ 410 410 int VideoOutputXv::GrabSuitableXvPort(MythXDisplay* disp, Window root, 411 PlaySettings *settings, 411 412 MythCodecID mcodecid, 412 413 uint width, uint height, 413 414 bool &xvsetdefaults, … … 492 493 } 493 494 494 495 // figure out if we want chromakeying.. 495 VideoDisplayProfile vdp ;496 VideoDisplayProfile vdp(settings); 496 497 vdp.SetInput(QSize(width, height)); 497 498 bool check_for_colorkey = (vdp.GetOSDRenderer() == "chromakey"); 498 499 … … 785 786 disp->StartLog(); 786 787 QString adaptor_name = QString::null; 787 788 const QSize video_dim = windows[0].GetVideoDim(); 788 xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), mcodecid,789 xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), settings, mcodecid, 789 790 video_dim.width(), video_dim.height(), 790 791 xv_set_defaults, 791 792 xvmc_chroma, &xvmc_surf_info, &adaptor_name); … … 864 865 disp->StartLog(); 865 866 QString adaptor_name = QString::null; 866 867 const QSize video_dim = windows[0].GetVideoDim(); 867 xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), kCodec_MPEG2,868 xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), settings, kCodec_MPEG2, 868 869 video_dim.width(), video_dim.height(), 869 870 xv_set_defaults, 0, NULL, &adaptor_name); 870 871 if (xv_port == -1) … … 1018 1019 uint width, uint height, 1019 1020 uint osd_width, uint osd_height, 1020 1021 uint stream_type, int xvmc_chroma, 1021 bool test_surface, bool force_xv) 1022 bool test_surface, bool force_xv, 1023 PlaySettings *settings) 1022 1024 { 1023 1025 (void)width, (void)height, (void)osd_width, (void)osd_height; 1024 1026 (void)stream_type, (void)xvmc_chroma, (void)test_surface; … … 1029 1031 return ret; 1030 1032 1031 1033 #ifdef USING_XVMC 1032 VideoDisplayProfile vdp ;1034 VideoDisplayProfile vdp(settings); 1033 1035 vdp.SetInput(QSize(width, height)); 1034 1036 QString dec = vdp.GetDecoder(); 1035 1037 if ((dec == "libmpeg2") || (dec == "ffmpeg")) … … 1079 1081 1080 1082 ok = false; 1081 1083 bool dummy; 1082 int port = GrabSuitableXvPort(disp, disp->GetRoot(), ret, width, height, 1084 int port = GrabSuitableXvPort(disp, disp->GetRoot(), settings, 1085 ret, width, height, 1083 1086 dummy, xvmc_chroma, &info); 1084 1087 if (port >= 0) 1085 1088 { -
libs/libmythtv/udpnotify.cpp
31 31 #include "udpnotify.h" 32 32 #include "mythcorecontext.h" 33 33 #include "mythverbose.h" 34 #include "playsettings.h" 34 35 35 36 UDPNotifyOSDSet::UDPNotifyOSDSet(const QString &name, uint timeout) 36 37 : m_name(name), m_timeout(timeout) … … 73 74 74 75 ///////////////////////////////////////////////////////////////////////// 75 76 76 UDPNotify::UDPNotify(uint udp_port ) :77 UDPNotify::UDPNotify(uint udp_port, PlaySettings *settings) : 77 78 m_socket(new QUdpSocket()), m_db_osd_udpnotify_timeout(5) 78 79 { 79 80 connect(m_socket, SIGNAL(readyRead()), … … 81 82 82 83 m_socket->bind(udp_port); 83 84 84 m_db_osd_udpnotify_timeout = gCoreContext->GetNumSetting("OSDNotifyTimeout", 5);85 m_db_osd_udpnotify_timeout = settings->GetNumSetting("OSDNotifyTimeout", 5); 85 86 } 86 87 87 88 void UDPNotify::deleteLater(void) -
libs/libmythtv/videooutbase.h
29 29 class FilterChain; 30 30 class FilterManager; 31 31 class OpenGLContextGLX; 32 class PlaySettings; 32 33 33 34 typedef QMap<NuppelVideoPlayer*,PIPLocation> PIPMap; 34 35 … … 49 50 PIPState pipState, 50 51 const QSize &video_dim, float video_aspect, 51 52 WId win_id, const QRect &display_rect, 52 float video_prate, WId embed_id); 53 float video_prate, WId embed_id, 54 PlaySettings *settings); 53 55 54 VideoOutput( );56 VideoOutput(PlaySettings *settings); 55 57 virtual ~VideoOutput(); 56 58 57 59 virtual bool Init(int width, int height, float aspect, … … 59 61 int winh, WId embedid = 0); 60 62 virtual void InitOSD(OSD *osd); 61 63 virtual void SetVideoFrameRate(float); 62 virtual bool IsPreferredRenderer(QSize video_size );64 virtual bool IsPreferredRenderer(QSize video_size, PlaySettings *settings); 63 65 virtual bool SetDeinterlacingEnabled(bool); 64 66 virtual bool SetupDeinterlace(bool i, const QString& ovrf=""); 65 67 virtual void FallbackDeint(void); … … 328 330 // Display information 329 331 QSize monitor_sz; 330 332 QSize monitor_dim; 333 334 PlaySettings *settings; 331 335 }; 332 336 333 337 #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) … … 112 113 m_subtitles.clear(); 113 114 } 114 115 115 bool TextSubtitleParser::LoadSubtitles(QString fileName, TextSubtitles &target) 116 bool TextSubtitleParser::LoadSubtitles(QString fileName, TextSubtitles &target, 117 PlaySettings *settings) 116 118 { 117 119 demux_sputext_t sub_data; 118 120 sub_data.rbuffer = new RingBuffer(fileName, 0, false); … … 130 132 target.SetFrameBasedTiming(!sub_data.uses_time); 131 133 132 134 QTextCodec *textCodec = NULL; 133 QString codec = gCoreContext->GetSetting("SubtitleCodec", "");135 QString codec = settings->GetSetting("SubtitleCodec", ""); 134 136 if (!codec.isEmpty()) 135 137 textCodec = QTextCodec::codecForName(codec.toLatin1()); 136 138 if (!textCodec) -
libs/libmythtv/osd.cpp
32 32 #include "mythverbose.h" 33 33 #include "util.h" 34 34 #include "channelutil.h" 35 #include "playsettings.h" 35 36 36 37 #include "x11colors.h" 37 38 #include "mythdirs.h" … … 42 43 static char *cc708_default_font_names[16]; 43 44 static bool cc708_defaults_initialized = false; 44 45 static QMutex cc708_init_lock; 45 static void initialize_osd_fonts( void);46 static void initialize_osd_fonts(PlaySettings *settings); 46 47 47 48 #define LOC QString("OSD: ") 48 49 #define LOC_ERR QString("OSD, Error: ") … … 59 60 const char *kOSDDialogInfo = "infobox"; 60 61 const char *kOSDDialogEditChannel = "channel_editor"; 61 62 62 OSD::OSD( ) :63 OSD::OSD(PlaySettings *_settings) : 63 64 QObject(), m_listener(NULL), 65 settings(_settings), 64 66 osdBounds(), frameint(0), 65 67 needPillarBox(false), 66 themepath(FindTheme( gCoreContext->GetSetting("OSDTheme"))),68 themepath(FindTheme(settings->GetSetting("OSDTheme", ""))), 67 69 wscale(1.0f), fscale(1.0f), 68 70 m_themeinfo(new ThemeInfo(themepath)), 69 71 m_themeaspect(4.0f/3.0f), … … 173 175 drawSurface = new OSDSurface(osd_bounds.width(), osd_bounds.height()); 174 176 175 177 if (!cc708_defaults_initialized) 176 initialize_osd_fonts( );178 initialize_osd_fonts(settings); 177 179 178 180 for (uint i = 0; i < 16; i++) 179 181 cc708fontnames[i] = cc708_default_font_names[i]; … … 186 188 if (themepath.isEmpty()) 187 189 { 188 190 VERBOSE(VB_IMPORTANT, "Couldn't find OSD theme: " 189 << gCoreContext->GetSetting("OSDTheme"));191 <<settings->GetSetting("OSDTheme", "")); 190 192 InitDefaults(); 191 193 return; 192 194 } … … 195 197 if (!LoadTheme()) 196 198 { 197 199 VERBOSE(VB_IMPORTANT, "Couldn't load OSD theme: " 198 << gCoreContext->GetSetting("OSDTheme")<<" at "<<themepath);200 <<settings->GetSetting("OSDTheme", "")<<" at "<<themepath); 199 201 } 200 202 201 203 InitDefaults(); … … 239 241 QString name = "cc_font"; 240 242 int fontsize = m_themeinfo->BaseRes()->height() / 27; 241 243 242 ccfont = LoadFont( gCoreContext->GetSetting("OSDCCFont"), fontsize);244 ccfont = LoadFont(settings->GetSetting("OSDCCFont", ""), fontsize); 243 245 244 246 if (ccfont) 245 247 fontMap[name] = ccfont; … … 275 277 276 278 OSDTypeCC *ccpage = 277 279 new OSDTypeCC(name, ccfont, sub_xoff, sub_yoff, 278 sub_dispw, sub_disph, wmult, hmult );280 sub_dispw, sub_disph, wmult, hmult, settings); 279 281 container->AddType(ccpage); 280 282 return true; 281 283 } … … 294 296 295 297 // Create fonts... 296 298 TTFFont* ccfonts[48]; 297 uint z = gCoreContext->GetNumSetting("OSDCC708TextZoom", 100) *299 uint z = settings->GetNumSetting("OSDCC708TextZoom", 100) * 298 300 m_themeinfo->BaseRes()->height(); 299 301 uint fontsizes[3] = { z / 3600, z / 2900, z / 2200 }; 300 302 for (uint i = 0; i < 48; i++) … … 361 363 if (!font) 362 364 { 363 365 int fontsize = (size->height() - (2 * safe_y)) / 26; 364 font = LoadFont( gCoreContext->GetSetting("OSDCCFont"), fontsize);366 font = LoadFont(settings->GetSetting("OSDCCFont", ""), fontsize); 365 367 366 368 if (font) 367 369 fontMap[fontname] = font; … … 469 471 TTFFont *font = GetFont(fontname); 470 472 if (!font) 471 473 { 472 font = LoadFont(gCoreContext->GetSetting("OSDCCFont"), SUBTITLE_FONT_SIZE); 474 font = LoadFont(settings->GetSetting("OSDCCFont", ""), 475 SUBTITLE_FONT_SIZE); 473 476 474 477 if (font) 475 478 { … … 537 540 538 541 if (!actfont) 539 542 { 540 actfont = LoadFont( gCoreContext->GetSetting("OSDFont"), 16);543 actfont = LoadFont(settings->GetSetting("OSDFont", ""), 16); 541 544 542 545 if (actfont) 543 546 fontMap["treemenulistfont"] = actfont; … … 685 688 if (dir.exists()) 686 689 { 687 690 VERBOSE(VB_IMPORTANT, QString("Couldn't find OSD theme: %1. " 688 "Switching to default.").arg(gCoreContext->GetSetting("OSDTheme")));689 gCoreContext->OverrideSettingForSession("OSDTheme", "BlackCurves-OSD");691 "Switching to default.").arg(settings->GetSetting("OSDTheme", ""))); 692 settings->OverrideSetting/*ForSession*/("OSDTheme", "BlackCurves-OSD"); 690 693 return testdir; 691 694 } 692 695 … … 853 856 void OSD::parseFont(QDomElement &element) 854 857 { 855 858 QString name; 856 QString fontfile = gCoreContext->GetSetting("OSDFont");859 QString fontfile = settings->GetSetting("OSDFont", ""); 857 860 int size = -1; 858 861 int sizeSmall = -1; 859 862 int sizeBig = -1; … … 931 934 return; 932 935 } 933 936 934 QString fontSizeType = gCoreContext->GetSetting("OSDThemeFontSizeType",937 QString fontSizeType = settings->GetSetting("OSDThemeFontSizeType", 935 938 "default"); 936 939 if (fontSizeType == "small") 937 940 { … … 3112 3115 return QRect(xoffset, yoffset, displaywidth, displayheight); 3113 3116 } 3114 3117 3115 #define OSD_STRDUP(X) strdup( gCoreContext->GetSetting(X).toLocal8Bit().constData())3118 #define OSD_STRDUP(X) strdup(settings->GetSetting(X, "").toLocal8Bit().constData()) 3116 3119 3117 static void initialize_osd_fonts( void)3120 static void initialize_osd_fonts(PlaySettings *settings) 3118 3121 { 3119 3122 QMutexLocker locker(&cc708_init_lock); 3120 3123 if (cc708_defaults_initialized) 3121 3124 return; 3122 3125 cc708_defaults_initialized = true; 3123 3126 3124 QString default_font_type = gCoreContext->GetSetting(3127 QString default_font_type = settings->GetSetting( 3125 3128 "OSDCC708DefaultFontType", "MonoSerif"); 3126 3129 3127 3130 // 0 -
libs/libmythtv/videoout_quartz.h
3 3 4 4 class DVDV; 5 5 struct QuartzData; 6 class PlaySettings; 6 7 7 8 #include "videooutbase.h" 8 9 … … 10 11 { 11 12 public: 12 13 static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); 13 VideoOutputQuartz(MythCodecID av_codec_id, void *codec_priv); 14 VideoOutputQuartz(PlaySettings *settings, MythCodecID av_codec_id, 15 void *codec_priv); 14 16 ~VideoOutputQuartz(); 15 17 16 18 bool Init(int width, int height, float aspect, WId winid, … … 51 53 static MythCodecID GetBestSupportedCodec( 52 54 uint width, uint height, 53 55 uint osd_width, uint osd_height, 54 uint stream_type, uint fourcc );56 uint stream_type, uint fourcc, PlaySettings *settings); 55 57 virtual bool NeedExtraAudioDecode(void) const 56 58 { return !codec_is_std(myth_codec_id); } 57 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/udpnotify.h
20 20 class QByteArray; 21 21 class QUdpSocket; 22 22 class QDomElement; 23 class PlaySettings; 23 24 24 25 class UDPNotifyOSDSet 25 26 { … … 54 55 Q_OBJECT 55 56 56 57 public: 57 UDPNotify(uint udp_port );58 UDPNotify(uint udp_port, PlaySettings *settings); 58 59 59 60 signals: 60 61 void AddUDPNotifyEvent(const QString &name, const UDPNotifyOSDSet*); -
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 cbwidget->insertItem(label); 739 807 } 740 808 809 if (special_formatting) 810 { 811 changeOnSpecial = true; 812 specialLabel = label; 813 } 814 741 815 SelectSetting::addSelection(label, value, select); 742 816 743 817 if (cbwidget && isSet) … … 934 1008 BooleanSetting::setHelpText(str); 935 1009 } 936 1010 1011 QWidget* TristateCheckBoxSetting::configWidget(ConfigurationGroup *cg, 1012 QWidget* parent, 1013 const char* widgetName) { 1014 widget = new MythCheckBox(parent, widgetName, true); 1015 connect(widget, SIGNAL(destroyed(QObject*)), 1016 this, SLOT(widgetDeleted(QObject*))); 1017 1018 widget->setHelpText(getHelpText()); 1019 widget->setText(getLabel()); 1020 widget->setCheckState(tristateValue()); 1021 setValue(tristateValue()); 1022 1023 connect(widget, SIGNAL(stateChanged(int)), 1024 this, SLOT(setValue(int))); 1025 connect(this, SIGNAL(valueChanged(int)), 1026 this, SLOT(relayValueChanged(int))); 1027 1028 if (cg) 1029 connect(widget, SIGNAL(changeHelpText(QString)), cg, 1030 SIGNAL(changeHelpText(QString))); 1031 1032 return widget; 1033 } 1034 1035 void TristateCheckBoxSetting::widgetInvalid(QObject *obj) 1036 { 1037 widget = (widget == obj) ? NULL : widget; 1038 } 1039 1040 void TristateCheckBoxSetting::setEnabled(bool fEnabled) 1041 { 1042 TristateSetting::setEnabled(fEnabled); 1043 if (widget) 1044 widget->setEnabled(fEnabled); 1045 } 1046 1047 void TristateCheckBoxSetting::setHelpText(const QString &str) 1048 { 1049 if (widget) 1050 widget->setHelpText(str); 1051 TristateSetting::setHelpText(str); 1052 } 1053 1054 const char *TristateSetting::kPartiallyCheckedString = "default"; 1055 1056 void TristateCheckBoxSetting::setValue(int check) 1057 { 1058 adjustFont(widget, (check != Qt::Checked && check != Qt::Unchecked)); 1059 TristateSetting::setValue(check); 1060 emit valueChanged(check); 1061 } 1062 1063 void TristateSetting::setValue(int check) 1064 { 1065 if (check == Qt::Checked) 1066 Setting::setValue("1"); 1067 else if (check == Qt::Unchecked) 1068 Setting::setValue("0"); 1069 else 1070 Setting::setValue(kPartiallyCheckedString); 1071 emit valueChanged(check); 1072 } 1073 937 1074 void AutoIncrementDBSetting::Save(QString table) 938 1075 { 939 1076 if (intValue() == 0) … … 1121 1258 addSelection(label, value, select); 1122 1259 } 1123 1260 1261 void ImageSelectSetting::addDefaultSelection(const QString label, 1262 const QString value, 1263 const QString defaultValue, 1264 bool select) 1265 { 1266 for (unsigned i=0; i<values.size(); i++) 1267 { 1268 if (values[i] == defaultValue) 1269 { 1270 changeOnSpecial = true; 1271 specialLabel = label; 1272 images.push_back(new QImage(*images[i])); 1273 addSelection(label, value, select); 1274 return; 1275 } 1276 } 1277 } 1278 1124 1279 ImageSelectSetting::~ImageSelectSetting() 1125 1280 { 1126 1281 Teardown(); … … 1143 1298 bxwidget = NULL; 1144 1299 imagelabel = NULL; 1145 1300 combo = NULL; 1301 labelWidget = NULL; 1146 1302 } 1147 1303 1148 1304 void ImageSelectSetting::imageSet(int num) … … 1190 1346 QLabel *label = new QLabel(); 1191 1347 label->setText(getLabel() + ":"); 1192 1348 layout->addWidget(label); 1349 labelWidget = label; 1193 1350 } 1194 1351 1195 1352 combo = new MythComboBox(false); … … 1236 1393 connect(combo, SIGNAL(highlighted(int)), this, SLOT(imageSet(int))); 1237 1394 connect(combo, SIGNAL(activated(int)), this, SLOT(setValue(int))); 1238 1395 connect(combo, SIGNAL(activated(int)), this, SLOT(imageSet(int))); 1396 connect(combo, SIGNAL(highlighted(const QString &)), 1397 this, SLOT(changeLabel(const QString &))); 1398 connect(combo, SIGNAL(activated(const QString &)), 1399 this, SLOT(changeLabel(const QString &))); 1239 1400 1240 1401 connect(this, SIGNAL(selectionsCleared()), 1241 1402 combo, SLOT(clear())); … … 1246 1407 1247 1408 bxwidget->setLayout(layout); 1248 1409 1410 changeLabel(GetLabel(current)); 1411 1249 1412 return bxwidget; 1250 1413 } 1251 1414 1415 void ImageSelectSetting::changeLabel(const QString &newLabel) 1416 { 1417 if (changeOnSpecial) 1418 { 1419 adjustFont(labelWidget, specialLabel == newLabel); 1420 adjustFont(combo, specialLabel == newLabel); 1421 } 1422 } 1423 1252 1424 void ImageSelectSetting::widgetInvalid(QObject *obj) 1253 1425 { 1254 1426 if (bxwidget == obj) -
libs/libmyth/audiooutputbase.h
155 155 int orig_config_channels; 156 156 int src_quality; 157 157 158 PlaySettings *psettings; 159 158 160 private: 159 161 // software volume 160 162 template <class AudioDataType> -
libs/libmyth/audiooutputalsa.cpp
8 8 9 9 #include "mythcorecontext.h" 10 10 #include "audiooutputalsa.h" 11 #include "playsettings.h" 11 12 12 13 #define LOC QString("ALSA: ") 13 14 #define LOC_WARN QString("ALSA, Warning: ") … … 753 754 { 754 755 int volume; 755 756 756 mixer_control = gCoreContext->GetSetting("MixerControl", "PCM");757 mixer_control = psettings->GetSetting("MixerControl", "PCM"); 757 758 758 759 SetupMixer(); 759 760 760 761 if (mixer_handle != NULL && setstartingvolume) 761 762 { 762 volume = gCoreContext->GetNumSetting("MasterMixerVolume", 80);763 volume = psettings->GetNumSetting("MasterMixerVolume", 80); 763 764 SetCurrentVolume("Master", 0, volume); 764 765 SetCurrentVolume("Master", 1, volume); 765 766 766 volume = gCoreContext->GetNumSetting("PCMMixerVolume", 80);767 volume = psettings->GetNumSetting("PCMMixerVolume", 80); 767 768 SetCurrentVolume("PCM", 0, volume); 768 769 SetCurrentVolume("PCM", 1, volume); 769 770 } … … 780 781 { 781 782 int err; 782 783 783 QString alsadevice = gCoreContext->GetSetting("MixerDevice", "default");784 QString alsadevice = psettings->GetSetting("MixerDevice", "default"); 784 785 QString device = alsadevice.remove(QString("ALSA:")); 785 786 786 787 if (mixer_handle != NULL) -
libs/libmyth/volumebase.cpp
8 8 9 9 #include "volumebase.h" 10 10 #include "mythcorecontext.h" 11 #include "playsettings.h" 11 12 12 VolumeBase::VolumeBase( ) :13 VolumeBase::VolumeBase(PlaySettings *_settings) : 13 14 internal_vol(false), volume(80), 14 current_mute_state(kMuteOff) 15 current_mute_state(kMuteOff), settings(_settings) 15 16 { 16 17 swvol = swvol_setting = 17 ( gCoreContext->GetSetting("MixerDevice", "default").toLower() == "software");18 (settings->GetSetting("MixerDevice", "default").toLower() == "software"); 18 19 } 19 20 20 21 bool VolumeBase::SWVolume(void) … … 39 40 volume = max(min(value, 100), 0); 40 41 UpdateVolume(); 41 42 42 QString controlLabel = gCoreContext->GetSetting("MixerControl", "PCM");43 QString controlLabel = settings->GetSetting("MixerControl", "PCM"); 43 44 controlLabel += "MixerVolume"; 44 45 gCoreContext->SaveSetting(controlLabel, volume); 45 46 } -
libs/libmyth/volumebase.h
3 3 4 4 #include "mythexp.h" 5 5 6 class PlaySettings; 7 6 8 typedef enum { 7 9 kMuteOff = 0, 8 10 kMuteLeft, … … 13 15 class MPUBLIC VolumeBase 14 16 { 15 17 public: 16 VolumeBase( );18 VolumeBase(PlaySettings *settings); 17 19 virtual ~VolumeBase() {}; 18 20 19 21 void SWVolume(bool set); … … 46 48 MuteState current_mute_state; 47 49 bool swvol; 48 50 bool swvol_setting; 51 PlaySettings *settings; 49 52 50 53 }; 51 54 -
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/audiooutputpulse.cpp
19 19 #include <QString> 20 20 21 21 #include "audiooutputpulse.h" 22 #include "playsettings.h" 22 23 23 24 #define LOC QString("PulseAudio: ") 24 25 #define LOC_ERR QString("PulseAudio Error: ") … … 547 548 (char*)"under"); 548 549 if (set_initial_vol) 549 550 { 550 int volume = gCoreContext->GetNumSetting("MasterMixerVolume", 80);551 int volume = psettings->GetNumSetting("MasterMixerVolume", 80); 551 552 pa_cvolume_set(&volume_control, audio_channels, 552 553 (float)volume * (float)PA_VOLUME_NORM / 100.0f); 553 554 } -
libs/libmyth/audiosettings.cpp
6 6 */ 7 7 8 8 #include "audiosettings.h" 9 #include "playsettings.h" 9 10 10 11 // startup_upmixer 11 12 AudioSettings::AudioSettings() : … … 18 19 set_initial_vol(false), 19 20 use_passthru(false), 20 21 source(AUDIOOUTPUT_UNKNOWN), 22 psettings(0), 21 23 upmixer(0) 22 24 { 23 25 } … … 32 34 set_initial_vol(other.set_initial_vol), 33 35 use_passthru(other.use_passthru), 34 36 source(other.source), 37 psettings(other.psettings), 35 38 upmixer(other.upmixer) 36 39 { 37 40 } … … 46 49 AudioOutputSource audio_source, 47 50 bool audio_set_initial_vol, 48 51 bool audio_use_passthru, 52 PlaySettings *_psettings, 49 53 int upmixer_startup) : 50 54 main_device(audio_main_device), 51 55 passthru_device(audio_passthru_device), … … 56 60 set_initial_vol(audio_set_initial_vol), 57 61 use_passthru(audio_use_passthru), 58 62 source(audio_source), 63 psettings(_psettings), 59 64 upmixer(upmixer_startup) 60 65 { 66 if (!psettings) 67 { 68 QString name("Default"); 69 psettings = new PlaySettings(name); 70 } 61 71 } 62 72 63 73 AudioSettings::AudioSettings( … … 66 76 int audio_codec, 67 77 int audio_samplerate, 68 78 bool audio_use_passthru, 79 PlaySettings *_psettings, 69 80 int upmixer_startup) : 70 81 main_device(QString::null), 71 82 passthru_device(QString::null), … … 76 87 set_initial_vol(false), 77 88 use_passthru(audio_use_passthru), 78 89 source(AUDIOOUTPUT_UNKNOWN), 90 psettings(_psettings), 79 91 upmixer(upmixer_startup) 80 92 { 93 if (!psettings) 94 { 95 QString name("Default"); 96 psettings = new PlaySettings(name); 97 } 81 98 } 82 99 100 AudioSettings::AudioSettings( 101 int audio_bits, 102 int audio_channels, 103 int audio_codec, 104 int audio_samplerate, 105 bool audio_use_passthru, 106 int upmixer_startup) : 107 main_device(QString::null), 108 passthru_device(QString::null), 109 bits(audio_bits), 110 channels(audio_channels), 111 codec(audio_codec), 112 samplerate(audio_samplerate), 113 set_initial_vol(false), 114 use_passthru(audio_use_passthru), 115 source(AUDIOOUTPUT_UNKNOWN), 116 psettings(NULL), 117 upmixer(upmixer_startup) 118 { 119 if (!psettings) 120 { 121 QString name("Default"); 122 psettings = new PlaySettings(name); 123 } 124 } 125 83 126 void AudioSettings::FixPassThrough(void) 84 127 { 85 128 if (passthru_device.isEmpty() || passthru_device.toLower() == "default") -
libs/libmyth/audiooutputca.cpp
246 246 247 247 if (internal_vol && set_initial_vol) 248 248 { 249 QString controlLabel = gCoreContext->GetSetting("MixerControl", "PCM");249 QString controlLabel = psettings->GetSetting("MixerControl", "PCM"); 250 250 controlLabel += "MixerVolume"; 251 251 SetCurrentVolume(gCoreContext->GetNumSetting(controlLabel, 80)); 252 252 } -
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); … … 338 352 public slots: 339 353 void addSelection(const QString &label, 340 354 QString value = QString::null, 341 bool select = false); 355 bool select = false, 356 bool special_formatting = false); 342 357 bool removeSelection(const QString &label, 343 358 QString value = QString::null); 359 virtual void changeLabel(const QString &newValue); 344 360 void editTextChanged(const QString &newText); 345 361 346 362 private: 347 363 bool rw; 348 364 QWidget *bxwidget; 349 365 MythComboBox *cbwidget; 366 bool changeOnSpecial; 367 QString specialLabel; 368 QLabel *labelWidget; 350 369 351 370 protected: 352 371 int step; … … 415 434 ImageSelectSetting(Storage *_storage) : 416 435 SelectSetting(_storage), 417 436 bxwidget(NULL), imagelabel(NULL), combo(NULL), 418 m_hmult(1.0f), m_wmult(1.0f) { } 437 m_hmult(1.0f), m_wmult(1.0f), 438 changeOnSpecial(false), specialLabel(""), labelWidget(NULL) { } 419 439 virtual QWidget* configWidget(ConfigurationGroup *cg, QWidget* parent, 420 440 const char* widgetName = 0); 421 441 virtual void widgetInvalid(QObject *obj); … … 426 446 QImage* image, 427 447 QString value=QString::null, 428 448 bool select=false); 449 virtual void addDefaultSelection(const QString label, 450 const QString value, 451 const QString defaultValue, 452 bool select); 429 453 430 454 protected slots: 431 455 void imageSet(int); 456 void changeLabel(const QString &newLabel); 432 457 433 458 protected: 434 459 void Teardown(void); … … 440 465 QLabel *imagelabel; 441 466 MythComboBox *combo; 442 467 float m_hmult, m_wmult; 468 bool changeOnSpecial; 469 QString specialLabel; 470 QLabel *labelWidget; 443 471 }; 444 472 445 473 class MPUBLIC BooleanSetting : public Setting … … 480 508 MythCheckBox *widget; 481 509 }; 482 510 511 class MPUBLIC TristateSetting : public BooleanSetting 512 { 513 Q_OBJECT 514 515 public: 516 TristateSetting(Storage *_storage) : BooleanSetting(_storage) {} 517 518 Qt::CheckState tristateValue(void) const { 519 if (getValue() == "0") 520 return Qt::Unchecked; 521 if (getValue() == "1") 522 return Qt::Checked; 523 return Qt::PartiallyChecked; 524 } 525 526 static const char *kPartiallyCheckedString; 527 528 public slots: 529 virtual void setValue(/*Qt::CheckState*/int check); 530 531 signals: 532 void valueChanged(int); 533 }; 534 535 class MPUBLIC TristateCheckBoxSetting: public TristateSetting { 536 Q_OBJECT 537 538 public: 539 TristateCheckBoxSetting(Storage *_storage) : 540 TristateSetting(_storage), widget(NULL) { } 541 virtual QWidget* configWidget(ConfigurationGroup *cg, QWidget* parent, 542 const char* widgetName = 0); 543 virtual void widgetInvalid(QObject*); 544 545 virtual void setEnabled(bool b); 546 547 virtual void setHelpText(const QString &str); 548 549 550 public slots: 551 virtual void setValue(/*Qt::CheckState*/int check); 552 virtual void relayValueChanged(int state) { 553 if (widget) 554 widget->setCheckState((Qt::CheckState)state); 555 } 556 557 protected: 558 MythCheckBox *widget; 559 }; 560 483 561 class MPUBLIC PathSetting : public ComboBoxSetting 484 562 { 485 563 public: -
libs/libmyth/audiooutputjack.cpp
14 14 #include "mythcorecontext.h" 15 15 #include "audiooutputjack.h" 16 16 #include "util.h" 17 #include "playsettings.h" 17 18 18 19 extern "C" 19 20 { … … 213 214 { 214 215 int volume = 100; 215 216 if (set_initial_vol) 216 volume = gCoreContext->GetNumSetting("MasterMixerVolume", 80);217 volume = psettings->GetNumSetting("MasterMixerVolume", 80); 217 218 218 219 JACK_SetAllVolume(audioid, volume); 219 220 } -
libs/libmyth/audiooutputbase.cpp
15 15 #include "audiooutputdigitalencoder.h" 16 16 #include "SoundTouch.h" 17 17 #include "freesurround.h" 18 #include "playsettings.h" 18 19 19 20 #define LOC QString("AO: ") 20 21 #define LOC_ERR QString("AO, ERROR: ") 21 22 22 23 AudioOutputBase::AudioOutputBase(const AudioSettings &settings) : 24 AudioOutput(settings.psettings), 23 25 // protected 24 26 effdsp(0), effdspstretched(0), 25 27 audio_channels(-1), audio_codec(CODEC_ID_NONE), … … 40 42 set_initial_vol(settings.set_initial_vol), 41 43 buffer_output_data_for_use(false), 42 44 45 psettings(settings.psettings), 46 43 47 // private 44 48 need_resampler(false), 45 49 … … 82 86 memset(tmp_buff, 0, sizeof(short) * kAudioTempBufSize); 83 87 memset(&audiotime_updated, 0, sizeof(audiotime_updated)); 84 88 memset(audiobuffer, 0, sizeof(char) * kAudioRingBufferSize); 85 orig_config_channels = gCoreContext->GetNumSetting("MaxChannels", 2);86 src_quality = gCoreContext->GetNumSetting("AudioUpmixType", 2);89 orig_config_channels = psettings->GetNumSetting("MaxChannels", 2); 90 src_quality = psettings->GetNumSetting("AudioUpmixType", 2); 87 91 //Set default upsampling quality to medium if using stereo 88 92 if (orig_config_channels == 2) 89 93 src_quality = 1; 90 94 91 95 // Handle override of SRC quality settings 92 if ( gCoreContext->GetNumSetting("AdvancedAudioSettings", false) &&93 gCoreContext->GetNumSetting("SRCQualityOverride", false))96 if (psettings->GetNumSetting("AdvancedAudioSettings", false) && 97 psettings->GetNumSetting("SRCQualityOverride", false)) 94 98 { 95 src_quality = gCoreContext->GetNumSetting("SRCQuality", 1);99 src_quality = psettings->GetNumSetting("SRCQuality", 1); 96 100 // Extra test to keep backward compatibility with earlier SRC code setting 97 101 if (src_quality > 2) 98 102 src_quality = 2; … … 100 104 } 101 105 102 106 if (!settings.upmixer) 103 configured_audio_channels = gCoreContext->GetNumSetting("AudioDefaultUpmix", false) ? orig_config_channels : 2; 107 configured_audio_channels = 108 psettings->GetNumSetting("AudioDefaultUpmix", false) ? 109 orig_config_channels : 2; 104 110 else 105 111 if (settings.upmixer == 1) 106 112 configured_audio_channels = 2; 107 113 else 108 114 configured_audio_channels = 6; 109 115 110 allow_ac3_passthru = (orig_config_channels > 2) ? gCoreContext->GetNumSetting("AC3PassThru", false) : false; 116 allow_ac3_passthru = 117 (orig_config_channels > 2) ? 118 psettings->GetNumSetting("AC3PassThru", false) : false; 111 119 112 120 // You need to call Reconfigure from your concrete class. 113 121 // Reconfigure(laudio_bits, laudio_channels, … … 192 200 193 201 const AudioSettings settings(audio_bits, source_audio_channels, 194 202 audio_codec, source_audio_samplerate, 195 audio_passthru );203 audio_passthru, psettings); 196 204 Reconfigure(settings); 197 205 return (configured_audio_channels == 6); 198 206 } … … 278 286 killaudio = false; 279 287 pauseaudio = false; 280 288 was_paused = true; 281 internal_vol = gCoreContext->GetNumSetting("MythControlsVolume", 0);289 internal_vol = settings.psettings->GetNumSetting("MythControlsVolume", 0); 282 290 283 291 numlowbuffer = 0; 284 292 … … 378 386 // Only used for software volume 379 387 if (set_initial_vol && internal_vol) 380 388 { 381 QString controlLabel = gCoreContext->GetSetting("MixerControl", "PCM"); 389 QString controlLabel = 390 settings.psettings->GetSetting("MixerControl", "PCM"); 382 391 controlLabel += "MixerVolume"; 383 volume = gCoreContext->GetNumSetting(controlLabel, 80);392 volume = settings.psettings->GetNumSetting(controlLabel, 80); 384 393 } 385 394 386 395 SyncVolume(); … … 392 401 if (audio_buffer_unused < 0) 393 402 audio_buffer_unused = 0; 394 403 395 if (! gCoreContext->GetNumSetting("AdvancedAudioSettings", false))404 if (!settings.psettings->GetNumSetting("AdvancedAudioSettings", false)) 396 405 audio_buffer_unused = 0; 397 else if (!gCoreContext->GetNumSetting("AggressiveSoundcardBuffer", false)) 406 else if (!settings.psettings->GetNumSetting("AggressiveSoundcardBuffer", 407 false)) 398 408 audio_buffer_unused = 0; 399 409 400 410 audbuf_timecode = 0; … … 410 420 VERBOSE(VB_AUDIO, LOC + QString("create upmixer")); 411 421 if (configured_audio_channels == 6) 412 422 { 413 surround_mode = gCoreContext->GetNumSetting("AudioUpmixType", 2); 423 surround_mode = 424 settings.psettings->GetNumSetting("AudioUpmixType", 2); 414 425 } 415 426 416 427 upmixer = new FreeSurround( … … 684 695 volume = new_volume; 685 696 if (save) 686 697 { 687 QString controlLabel = gCoreContext->GetSetting("MixerControl", "PCM");698 QString controlLabel = psettings->GetSetting("MixerControl", "PCM"); 688 699 controlLabel += "MixerVolume"; 689 700 gCoreContext->SaveSetting(controlLabel, volume); 690 701 } -
libs/libmyth/audiooutput.cpp
6 6 #include "mythconfig.h" 7 7 #include "audiooutput.h" 8 8 #include "compat.h" 9 #include "playsettings.h" 9 10 10 11 #include "audiooutputnull.h" 11 12 #ifdef USING_MINGW … … 37 38 bool set_initial_vol, bool audio_passthru, 38 39 int upmixer_startup) 39 40 { 41 QString str("Default"); 42 PlaySettings psettings(str); 43 return OpenAudio(main_device, passthru_device, audio_bits, 44 audio_channels, audio_codec, audio_samplerate, 45 source, set_initial_vol, audio_passthru, 46 &psettings, upmixer_startup); 47 } 48 49 AudioOutput *AudioOutput::OpenAudio( 50 const QString &main_device, 51 const QString &passthru_device, 52 int audio_bits, int audio_channels, 53 int audio_codec, int audio_samplerate, 54 AudioOutputSource source, 55 bool set_initial_vol, bool audio_passthru, 56 PlaySettings *psettings, 57 int upmixer_startup) 58 { 40 59 AudioSettings settings( 41 60 main_device, passthru_device, audio_bits, 42 61 audio_channels, audio_codec, audio_samplerate, source, 43 set_initial_vol, audio_passthru, upmixer_startup);62 set_initial_vol, audio_passthru, psettings, upmixer_startup); 44 63 45 64 settings.FixPassThrough(); 46 65 -
libs/libmyth/libmyth.pro
60 60 SOURCES += mythrssmanager.cpp netgrabbermanager.cpp 61 61 SOURCES += rssparse.cpp netutils.cpp 62 62 63 HEADERS += playsettings.h 64 SOURCES += playsettings.cpp 65 63 66 # remove when everything is switched to mythui 64 67 SOURCES += virtualkeyboard_qt.cpp 65 68 -
libs/libmyth/audiosettings.h
12 12 13 13 #include "mythexp.h" 14 14 15 class PlaySettings; 16 15 17 typedef enum { 16 18 AUDIOOUTPUT_UNKNOWN, 17 19 AUDIOOUTPUT_VIDEO, … … 34 36 AudioOutputSource audio_source, 35 37 bool audio_set_initial_vol, 36 38 bool audio_use_passthru, 39 PlaySettings *psettings, 37 40 int upmixer_startup = 0); 38 41 39 42 AudioSettings(int audio_bits, … … 41 44 int audio_codec, 42 45 int audio_samplerate, 43 46 bool audio_use_passthru, 47 PlaySettings *psettings, 44 48 int upmixer_startup = 0); 45 49 50 AudioSettings(int audio_bits, 51 int audio_channels, 52 int audio_codec, 53 int audio_samplerate, 54 bool audio_use_passthru, 55 int upmixer_startup = 0); 56 46 57 void FixPassThrough(void); 47 58 void TrimDeviceType(void); 48 59 … … 61 72 bool set_initial_vol; 62 73 bool use_passthru; 63 74 AudioOutputSource source; 75 PlaySettings *psettings; 64 76 int upmixer; 65 77 }; 66 78 -
libs/libmyth/audiooutputoss.cpp
27 27 #include "mythcorecontext.h" 28 28 #include "audiooutputoss.h" 29 29 #include "util.h" 30 #include "playsettings.h" 30 31 31 32 AudioOutputOSS::AudioOutputOSS(const AudioSettings &settings) : 32 33 AudioOutputBase(settings), … … 316 317 mixerfd = -1; 317 318 int volume = 0; 318 319 319 QString device = gCoreContext->GetSetting("MixerDevice", "/dev/mixer");320 QString device = psettings->GetSetting("MixerDevice", "/dev/mixer"); 320 321 if (device.toLower() == "software") 321 322 return; 322 323 323 324 QByteArray dev = device.toAscii(); 324 325 mixerfd = open(dev.constData(), O_RDONLY); 325 326 326 QString controlLabel = gCoreContext->GetSetting("MixerControl", "PCM");327 QString controlLabel = psettings->GetSetting("MixerControl", "PCM"); 327 328 328 329 if (controlLabel == "Master") 329 330 { … … 344 345 if (set_initial_vol) 345 346 { 346 347 int tmpVol; 347 volume = gCoreContext->GetNumSetting("MasterMixerVolume", 80);348 volume = psettings->GetNumSetting("MasterMixerVolume", 80); 348 349 tmpVol = (volume << 8) + volume; 349 350 int ret = ioctl(mixerfd, MIXER_WRITE(SOUND_MIXER_VOLUME), &tmpVol); 350 351 if (ret < 0) … … 353 354 QString("Error Setting initial Master Volume") + ENO); 354 355 } 355 356 356 volume = gCoreContext->GetNumSetting("PCMMixerVolume", 80);357 volume = psettings->GetNumSetting("PCMMixerVolume", 80); 357 358 tmpVol = (volume << 8) + volume; 358 359 ret = ioctl(mixerfd, MIXER_WRITE(SOUND_MIXER_PCM), &tmpVol); 359 360 if (ret < 0) -
libs/libmyth/audiooutput.h
8 8 #include "volumebase.h" 9 9 #include "output.h" 10 10 11 class PlaySettings; 12 11 13 class MPUBLIC AudioOutput : public VolumeBase, public OutputListeners 12 14 { 13 15 public: … … 19 21 int audio_codec, int audio_samplerate, 20 22 AudioOutputSource source, 21 23 bool set_initial_vol, bool audio_passthru, 24 PlaySettings *psettings, 22 25 int upmixer_startup = 0); 26 static AudioOutput *OpenAudio( 27 const QString &audiodevice, 28 const QString &passthrudevice, 29 int audio_bits, int audio_channels, 30 int audio_codec, int audio_samplerate, 31 AudioOutputSource source, 32 bool set_initial_vol, bool audio_passthru, 33 int upmixer_startup = 0); 23 34 24 AudioOutput( ) :25 VolumeBase( ),OutputListeners(),35 AudioOutput(PlaySettings *psettings) : 36 VolumeBase(psettings), OutputListeners(), 26 37 lastError(QString::null), lastWarn(QString::null) {} 27 38 28 39 virtual ~AudioOutput() { }; -
libs/libmyth/mythconfiggroups.cpp
475 475 Configurable *target) 476 476 { 477 477 VerifyLayout(); 478 bool isDuplicate = triggerMap.values().contains(target); 478 479 triggerMap[triggerValue] = target; 479 480 480 481 if (!configStack) … … 484 485 configStack->setSaveAll(isSaveAll); 485 486 } 486 487 487 configStack->addChild(target); 488 // Don't add a target as a child if it has already been added, 489 // otherwise something goes wrong with signals in the child. 490 if (!isDuplicate) 491 configStack->addChild(target); 488 492 } 489 493 490 494 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
41 41 #include "mythconfig.h" 42 42 #include "mythdirs.h" 43 43 #include "mythuihelper.h" 44 #include "playsettings.h" 44 45 46 #define CREATE_CHECKBOX_SETTING(var, name, settings) \ 47 BooleanSetting *var; \ 48 if ((settings)) \ 49 var = new PlaySettingsCheckBox((name), (settings)); \ 50 else \ 51 var = new HostCheckBox((name)) 52 53 #define CREATE_COMBOBOX_SETTING(var, name, settings) \ 54 ComboBoxSetting *var; \ 55 if ((settings)) \ 56 var = new PlaySettingsComboBox((name), (settings)); \ 57 else \ 58 var = new HostComboBox((name)) 59 60 #define CREATE_COMBOBOX1_SETTING(var, name, settings, arg1) \ 61 ComboBoxSetting *var; \ 62 if ((settings)) \ 63 var = new PlaySettingsComboBox((name), (settings), (arg1)); \ 64 else \ 65 var = new HostComboBox((name), (arg1)) 66 67 #define CREATE_SPINBOX_SETTING(var, name, settings, arg1, arg2, arg3, arg4) \ 68 SpinBoxSetting *var; \ 69 if ((settings)) \ 70 var = new PlaySettingsSpinBox((name), (settings), (arg1), (arg2), (arg3), (arg4)); \ 71 else \ 72 var = new HostSpinBox((name), (arg1), (arg2), (arg3), (arg4)) 73 74 #define CREATE_LINEEDIT_SETTING(var, name, settings) \ 75 LineEditSetting *var; \ 76 if ((settings)) \ 77 var = new PlaySettingsLineEdit((name), (settings), ""); \ 78 else \ 79 var = new HostLineEdit((name)) 80 81 // For PlaySettings, use a SpinBox instead of a Slider so that a 82 // default value can be easily used. 83 #define CREATE_SLIDER_SETTING(var, name, settings, arg1, arg2, arg3) \ 84 BoundedIntegerSetting *var; \ 85 if ((settings)) \ 86 var = new PlaySettingsSpinBox((name), (settings), (arg1), (arg2), (arg3)); \ 87 else \ 88 var = new HostSlider((name), (arg1), (arg2), (arg3)) 89 90 #define CREATE_IMAGESELECT_SETTING(var, name, settings) \ 91 ImageSelectSetting *var; \ 92 if ((settings)) \ 93 var = new PlaySettingsImageSelect((name), (settings)); \ 94 else \ 95 var = new HostImageSelect((name)) 96 97 static Setting *wrap(Setting *obj, PlaySettings *settings, 98 bool twoLineLabel=false) 99 { 100 if (!settings) 101 return obj; 102 103 // Get the setting name 104 PlaySettingsCombinedStorage *storage = 105 dynamic_cast<PlaySettingsCombinedStorage *>(obj); 106 const QString &name = storage->getName(); 107 108 // Get the default value and label. The label is different 109 // from the value for most object types. 110 QString defaultValue = settings->GetSetting(name, "", true); 111 QString defaultLabel(defaultValue); 112 if (dynamic_cast<BooleanSetting *>(obj)) 113 defaultLabel = (defaultValue == "0" || defaultValue.isEmpty() ? 114 QObject::tr("disabled") : QObject::tr("enabled")); 115 if (dynamic_cast<SpinBoxSetting *>(obj) && defaultValue.isEmpty()) 116 defaultLabel = "0"; 117 ComboBoxSetting *cb = dynamic_cast<ComboBoxSetting *>(obj); 118 if (cb) 119 { 120 defaultLabel = cb->GetValueLabel(defaultValue); 121 // Add the default selection to a ComboBox 122 cb->addSelection(QString("(") + QObject::tr("default") + ")", 123 storage->getDefault(), 124 !settings->IsOverridden(name), 125 true); 126 } 127 ImageSelectSetting *is = dynamic_cast<ImageSelectSetting *>(obj); 128 if (is) 129 { 130 defaultLabel = is->GetValueLabel(defaultValue); 131 // Add the default selection to a ImageSelect 132 is->addDefaultSelection(QString("(") + QObject::tr("default") + ")", 133 storage->getDefault(), 134 defaultValue, 135 !settings->IsOverridden(name)); 136 } 137 138 // Change the help text to include the default and its source. 139 QString helpPrefix; 140 if (dynamic_cast<LineEditSetting *>(obj)) 141 helpPrefix = QObject::tr("Leave blank to keep default value"); 142 else 143 helpPrefix = QObject::tr("Override default value"); 144 helpPrefix += " (" + defaultLabel + ") "; 145 QString inheritsFrom = settings->InheritsFrom(name); 146 if (inheritsFrom.isNull()) 147 helpPrefix += QObject::tr("from global settings"); 148 else 149 helpPrefix += QObject::tr("from group") + " " + inheritsFrom; 150 helpPrefix += ". " + obj->getHelpText(); 151 obj->setHelpText(helpPrefix); 152 153 // Change the label to include the default. 154 obj->setLabel(obj->getLabel() + (twoLineLabel ? "\n" : "") + 155 " (" + defaultLabel + ")"); 156 157 return obj; 158 } 159 160 static QString getDefault(Setting *obj) 161 { 162 PlaySettingsCombinedStorage *storage = 163 dynamic_cast<PlaySettingsCombinedStorage *>(obj); 164 if (storage) 165 return storage->getDefault(); 166 else 167 return ""; 168 } 169 45 170 AudioOutputDevice::AudioOutputDevice() : HostComboBox("AudioOutputDevice", true) 46 171 { 47 172 setLabel(QObject::tr("Audio output device")); … … 103 228 setHelpText(desc); 104 229 } 105 230 106 static HostComboBox *MaxAudioChannels()231 static Setting *MaxAudioChannels(PlaySettings *settings) 107 232 { 108 HostComboBox *gc = new HostComboBox("MaxChannels",false);233 CREATE_COMBOBOX_SETTING(gc, "MaxChannels", settings); 109 234 gc->setLabel(QObject::tr("Speakers configuration")); 110 235 gc->addSelection(QObject::tr("Stereo"), "2", true); // default 111 236 gc->addSelection(QObject::tr("5.1"), "6"); 112 237 gc->setHelpText( 113 238 QObject::tr( 114 239 "Set your audio configuration: Stereo or Surround.")); 115 return gc;240 return wrap(gc, settings); 116 241 } 117 242 118 static HostCheckBox *AudioUpmix()243 static Setting *AudioUpmix(PlaySettings *settings) 119 244 { 120 HostCheckBox *gc = new HostCheckBox("AudioDefaultUpmix");245 CREATE_CHECKBOX_SETTING(gc, "AudioDefaultUpmix", settings); 121 246 gc->setLabel(QObject::tr("Upconvert stereo to 5.1 surround")); 122 247 gc->setValue(true); 123 248 gc->setHelpText(QObject::tr("MythTV can upconvert stereo to 5.1 audio. " 124 249 "Set this option to enable it by default. " 125 250 "You can enable or disable the upconversion during playback at anytime.")); 126 return gc;251 return wrap(gc, settings); 127 252 } 128 253 129 static HostComboBox *AudioUpmixType()254 static Setting *AudioUpmixType(PlaySettings *settings) 130 255 { 131 HostComboBox *gc = new HostComboBox("AudioUpmixType",false);256 CREATE_COMBOBOX_SETTING(gc, "AudioUpmixType", settings); 132 257 gc->setLabel(QObject::tr("Upmix")); 133 258 gc->addSelection(QObject::tr("Fastest"), "0", true); // default 134 259 gc->addSelection(QObject::tr("Good"), "1"); … … 137 262 QObject::tr( 138 263 "Set the audio surround upconversion quality. " 139 264 "'Fastest' is the least demanding on the CPU at the expense of quality.")); 140 return gc;265 return wrap(gc, settings); 141 266 } 142 267 143 static HostCheckBox *AdvancedAudioSettings()268 static Setting *AdvancedAudioSettings(PlaySettings *settings) 144 269 { 145 HostCheckBox *gc = new HostCheckBox("AdvancedAudioSettings");270 CREATE_CHECKBOX_SETTING(gc, "AdvancedAudioSettings", settings); 146 271 gc->setLabel(QObject::tr("Advanced Audio Configuration")); 147 272 gc->setValue(false); 148 273 gc->setHelpText(QObject::tr("Enable extra audio settings.")); 149 return gc;274 return wrap(gc, settings); 150 275 } 151 276 152 static HostCheckBox *SRCQualityOverride()277 static Setting *SRCQualityOverride(PlaySettings *settings) 153 278 { 154 HostCheckBox *gc = new HostCheckBox("SRCQualityOverride");279 CREATE_CHECKBOX_SETTING(gc, "SRCQualityOverride", settings); 155 280 gc->setLabel(QObject::tr("Override SRC quality")); 156 281 gc->setValue(false); 157 282 gc->setHelpText(QObject::tr("Override audio sample rate conversion quality")); 158 return gc;283 return wrap(gc, settings); 159 284 } 160 285 161 static HostComboBox *SRCQuality()286 static Setting *SRCQuality(PlaySettings *settings) 162 287 { 163 HostComboBox *gc = new HostComboBox("SRCQuality", false);288 CREATE_COMBOBOX_SETTING(gc, "SRCQuality", settings); 164 289 gc->setLabel(QObject::tr("Sample Rate Conversion")); 165 290 gc->addSelection(QObject::tr("Disabled"), "-1"); 166 291 gc->addSelection(QObject::tr("Fastest"), "0"); … … 170 295 "\"Good\" (default) provides the best compromise between CPU usage " 171 296 "and quality. \"Disabled\" let the audio card handle sample rate conversion. " 172 297 "This only affects non 48kHz PCM audio.")); 173 return gc;298 return wrap(gc, settings); 174 299 } 175 300 176 static HostComboBox *PassThroughOutputDevice()301 static Setting *PassThroughOutputDevice(PlaySettings *settings) 177 302 { 178 HostComboBox *gc = new HostComboBox("PassThruOutputDevice", true);303 CREATE_COMBOBOX1_SETTING(gc, "PassThruOutputDevice", settings, true); 179 304 180 305 gc->setLabel(QObject::tr("Digital output device")); 181 306 gc->addSelection(QObject::tr("Default"), "Default"); … … 193 318 gc->setHelpText(QObject::tr("Audio output device to use for digital audio. Default is the same as Audio output " 194 319 "device. This value is currently only used with ALSA " 195 320 "and DirectX sound output.")); 196 return gc;321 return wrap(gc, settings); 197 322 } 198 323 199 static HostCheckBox *MythControlsVolume()324 static Setting *MythControlsVolume(PlaySettings *settings) 200 325 { 201 HostCheckBox *gc = new HostCheckBox("MythControlsVolume");326 CREATE_CHECKBOX_SETTING(gc, "MythControlsVolume", settings); 202 327 gc->setLabel(QObject::tr("Use internal volume controls")); 203 328 gc->setValue(true); 204 329 gc->setHelpText(QObject::tr("MythTV can control the PCM and master " 205 330 "mixer volume. If you prefer to control the volume externally " 206 331 "(like your amplifier) or use an external mixer " 207 332 "program, disable this option.")); 208 return gc;333 return wrap(gc, settings); 209 334 } 210 335 211 static HostComboBox *MixerDevice()336 static Setting *MixerDevice(PlaySettings *settings) 212 337 { 213 HostComboBox *gc = new HostComboBox("MixerDevice", true);338 CREATE_COMBOBOX1_SETTING(gc, "MixerDevice", settings, true); 214 339 gc->setLabel(QObject::tr("Mixer Device")); 215 340 216 341 #ifdef USING_OSS … … 236 361 "the volume of all audio at the expense of a slight quality loss.")); 237 362 #endif 238 363 239 return gc;364 return wrap(gc, settings); 240 365 } 241 366 242 367 static const char* MixerControlControls[] = { "PCM", 243 368 "Master" }; 244 369 245 static HostComboBox *MixerControl()370 static Setting *MixerControl(PlaySettings *settings) 246 371 { 247 HostComboBox *gc = new HostComboBox("MixerControl", true);372 CREATE_COMBOBOX1_SETTING(gc, "MixerControl", settings, true); 248 373 gc->setLabel(QObject::tr("Mixer Controls")); 249 374 for (unsigned int i = 0; i < sizeof(MixerControlControls) / sizeof(char*); 250 375 ++i) … … 254 379 } 255 380 256 381 gc->setHelpText(QObject::tr("Changing the volume adjusts the selected mixer.")); 257 return gc;382 return wrap(gc, settings); 258 383 } 259 384 260 static HostSlider *MixerVolume()385 static Setting *MixerVolume(PlaySettings *settings) 261 386 { 262 HostSlider *gs = new HostSlider("MasterMixerVolume", 0, 100, 1);387 CREATE_SLIDER_SETTING(gs, "MasterMixerVolume", settings, 0, 100, 1); 263 388 gs->setLabel(QObject::tr("Master Mixer Volume")); 264 389 gs->setValue(70); 265 390 gs->setHelpText(QObject::tr("Initial volume for the Master Mixer. " 266 391 "This affects all sound created by the sound card. " 267 392 "Note: Do not set this too low.")); 268 return gs;393 return wrap(gs, settings); 269 394 } 270 395 271 static HostSlider *PCMVolume()396 static Setting *PCMVolume(PlaySettings *settings) 272 397 { 273 HostSlider *gs = new HostSlider("PCMMixerVolume", 0, 100, 1);398 CREATE_SLIDER_SETTING(gs, "PCMMixerVolume", settings, 0, 100, 1); 274 399 gs->setLabel(QObject::tr("PCM Mixer Volume")); 275 400 gs->setValue(70); 276 401 gs->setHelpText(QObject::tr("Initial volume for PCM output. Using the " … … 278 403 return gs; 279 404 } 280 405 281 static HostCheckBox *IndividualMuteControl()406 static Setting *IndividualMuteControl(PlaySettings *settings) 282 407 { 283 HostCheckBox *gc = new HostCheckBox("IndividualMuteControl");408 CREATE_CHECKBOX_SETTING(gc, "IndividualMuteControl", settings); 284 409 gc->setLabel(QObject::tr("Independent Muting of Left and Right Audio " 285 410 "Channels")); 286 411 gc->setValue(false); … … 289 414 "original language on one channel, and a dubbed " 290 415 "version of the program on the other one. This " 291 416 "modifies the behavior of the Mute key.")); 292 return gc;417 return wrap(gc, settings); 293 418 } 294 419 295 static HostCheckBox *AC3PassThrough()420 static Setting *AC3PassThrough(PlaySettings *settings) 296 421 { 297 HostCheckBox *gc = new HostCheckBox("AC3PassThru");422 CREATE_CHECKBOX_SETTING(gc, "AC3PassThru", settings); 298 423 gc->setLabel(QObject::tr("Dolby Digital")); 299 424 gc->setValue(false); 300 425 gc->setHelpText(QObject::tr("Enable if your amplifier or sound decoder supports AC3/Dolby Digital. " 301 426 "You must use a digital connection. Uncheck if using an analog connection.")); 302 return gc;427 return wrap(gc, settings); 303 428 } 304 429 305 static HostCheckBox *DTSPassThrough()430 static Setting *DTSPassThrough(PlaySettings *settings) 306 431 { 307 HostCheckBox *gc = new HostCheckBox("DTSPassThru");432 CREATE_CHECKBOX_SETTING(gc, "DTSPassThru", settings); 308 433 gc->setLabel(QObject::tr("DTS")); 309 434 gc->setValue(false); 310 435 gc->setHelpText(QObject::tr("Enable if your amplifier or sound decoder supports DTS. " 311 436 "You must use a digital connection. Uncheck if using an analog connection")); 312 return gc;437 return wrap(gc, settings); 313 438 } 314 439 315 static HostCheckBox *AggressiveBuffer()440 static Setting *AggressiveBuffer(PlaySettings *settings) 316 441 { 317 HostCheckBox *gc = new HostCheckBox("AggressiveSoundcardBuffer");442 CREATE_CHECKBOX_SETTING(gc, "AggressiveSoundcardBuffer", settings); 318 443 gc->setLabel(QObject::tr("Aggressive Sound card Buffering")); 319 444 gc->setValue(false); 320 445 gc->setHelpText(QObject::tr("If enabled, MythTV will pretend to have " … … 324 449 return gc; 325 450 } 326 451 327 static HostCheckBox *DecodeExtraAudio()452 static Setting *DecodeExtraAudio(PlaySettings *settings) 328 453 { 329 HostCheckBox *gc = new HostCheckBox("DecodeExtraAudio");454 CREATE_CHECKBOX_SETTING(gc, "DecodeExtraAudio", settings); 330 455 gc->setLabel(QObject::tr("Extra audio buffering")); 331 456 gc->setValue(true); 332 457 gc->setHelpText(QObject::tr("Enable this setting if MythTV is playing " … … 335 460 "effect on framegrabbers (MPEG-4/RTJPEG). MythTV will " 336 461 "keep extra audio data in its internal buffers to workaround " 337 462 "this bug.")); 338 return gc;463 return wrap(gc, settings); 339 464 } 340 465 341 static HostComboBox *PIPLocationComboBox()466 static Setting *PIPLocationComboBox(PlaySettings *settings) 342 467 { 343 HostComboBox *gc = new HostComboBox("PIPLocation");468 CREATE_COMBOBOX_SETTING(gc, "PIPLocation", settings); 344 469 gc->setLabel(QObject::tr("PIP Video Location")); 345 470 for (uint loc = 0; loc < kPIP_END; ++loc) 346 471 gc->addSelection(toString((PIPLocation) loc), QString::number(loc)); 347 472 gc->setHelpText(QObject::tr("Location of PIP Video window.")); 348 return gc;473 return wrap(gc, settings); 349 474 } 350 475 351 476 static GlobalLineEdit *AllRecGroupPassword() … … 442 567 return gc; 443 568 } 444 569 445 static HostCheckBox *SmartForward()570 static Setting *SmartForward(PlaySettings *settings) 446 571 { 447 HostCheckBox *gc = new HostCheckBox("SmartForward");572 CREATE_CHECKBOX_SETTING(gc, "SmartForward", settings); 448 573 gc->setLabel(QObject::tr("Smart Fast Forwarding")); 449 574 gc->setValue(false); 450 575 gc->setHelpText(QObject::tr("If enabled, then immediately after " 451 576 "rewinding, only skip forward the same amount as " 452 577 "skipping backwards.")); 453 return gc;578 return wrap(gc, settings); 454 579 } 455 580 456 static HostCheckBox *ExactSeeking()581 static Setting *ExactSeeking(PlaySettings *settings) 457 582 { 458 HostCheckBox *gc = new HostCheckBox("ExactSeeking");583 CREATE_CHECKBOX_SETTING(gc, "ExactSeeking", settings); 459 584 gc->setLabel(QObject::tr("Seek to exact frame")); 460 585 gc->setValue(false); 461 586 gc->setHelpText(QObject::tr("If enabled, seeking is frame exact, but " 462 587 "slower.")); 463 return gc;588 return wrap(gc, settings); 464 589 } 465 590 466 591 static GlobalComboBox *CommercialSkipMethod() … … 478 603 return bc; 479 604 } 480 605 481 static HostComboBox *AutoCommercialSkip()606 static Setting *AutoCommercialSkip(PlaySettings *settings) 482 607 { 483 HostComboBox *gc = new HostComboBox("AutoCommercialSkip");608 CREATE_COMBOBOX_SETTING(gc, "AutoCommercialSkip", settings); 484 609 gc->setLabel(QObject::tr("Automatically Skip Commercials")); 485 610 gc->addSelection(QObject::tr("Off"), "0"); 486 611 gc->addSelection(QObject::tr("Notify, but do not skip"), "2"); … … 489 614 "have been flagged during Automatic Commercial Detection " 490 615 "or by the mythcommflag program, or just notify that a " 491 616 "commercial has been detected.")); 492 return gc;617 return wrap(gc, settings); 493 618 } 494 619 495 620 static GlobalCheckBox *AutoCommercialFlag() … … 574 699 return bc; 575 700 } 576 701 577 static HostSpinBox *CommRewindAmount()702 static Setting *CommRewindAmount(PlaySettings *settings) 578 703 { 579 HostSpinBox *gs = new HostSpinBox("CommRewindAmount", 0, 10, 1);704 CREATE_SPINBOX_SETTING(gs, "CommRewindAmount", settings, 0, 10, 1, false); 580 705 gs->setLabel(QObject::tr("Commercial Skip Auto-Rewind Amount")); 581 706 gs->setHelpText(QObject::tr("If set, MythTV will automatically rewind " 582 707 "this many seconds after performing a commercial skip.")); 583 708 gs->setValue(0); 584 return gs;709 return wrap(gs, settings); 585 710 } 586 711 587 static HostSpinBox *CommNotifyAmount()712 static Setting *CommNotifyAmount(PlaySettings *settings) 588 713 { 589 HostSpinBox *gs = new HostSpinBox("CommNotifyAmount", 0, 10, 1);714 CREATE_SPINBOX_SETTING(gs, "CommNotifyAmount", settings, 0, 10, 1, false); 590 715 gs->setLabel(QObject::tr("Commercial Skip Notify Amount")); 591 716 gs->setHelpText(QObject::tr("If set, MythTV will act like a commercial " 592 717 "begins this many seconds early. This can be useful " 593 718 "when commercial notification is used in place of " 594 719 "automatic skipping.")); 595 720 gs->setValue(0); 596 return gs;721 return wrap(gs, settings); 597 722 } 598 723 599 724 static GlobalSpinBox *MaximumCommercialSkip() … … 1395 1520 labels[j]->setValue(label_i); 1396 1521 } 1397 1522 1398 PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str) : 1523 PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str, 1524 PlaySettings *settings) : 1399 1525 TriggeredConfigurationGroup(false, true, true, true, 1400 1526 false, false, true, true), grouptrigger(NULL) 1401 1527 { 1402 1528 setLabel(QObject::tr("Playback Profiles") + str); 1529 if (settings) 1530 setLabel(QObject::tr("Playback group settings for ") + 1531 settings->mGroupName + " - " + 1532 getLabel()); 1403 1533 1404 1534 QString host = gCoreContext->GetHostName(); 1405 1535 QStringList profiles = VideoDisplayProfile::GetProfiles(host); … … 1427 1557 profiles = VideoDisplayProfile::GetProfiles(host); 1428 1558 } 1429 1559 1430 QString profile = VideoDisplayProfile::GetDefaultProfileName(host );1560 QString profile = VideoDisplayProfile::GetDefaultProfileName(host, settings); 1431 1561 if (!profiles.contains(profile)) 1432 1562 { 1433 1563 profile = (profiles.contains("Normal")) ? "Normal" : profiles[0]; 1434 1564 VideoDisplayProfile::SetDefaultProfileName(profile, host); 1435 1565 } 1436 1566 1437 grouptrigger = new HostComboBox("DefaultVideoPlaybackProfile"); 1567 CREATE_COMBOBOX_SETTING(gs, "DefaultVideoPlaybackProfile", settings); 1568 grouptrigger = gs; 1438 1569 grouptrigger->setLabel(QObject::tr("Current Video Playback Profile")); 1439 1570 QStringList::const_iterator it; 1440 1571 for (it = profiles.begin(); it != profiles.end(); ++it) 1441 1572 grouptrigger->addSelection(ProgramInfo::i18n(*it), *it); 1573 if (settings) 1574 { 1575 addChild(wrap(grouptrigger, settings)); 1576 return; 1577 } 1442 1578 1443 1579 HorizontalConfigurationGroup *grp = 1444 1580 new HorizontalConfigurationGroup(false, false, true, true); … … 1571 1707 return gc; 1572 1708 } 1573 1709 1574 static HostSpinBox *FFRewReposTime()1710 static Setting *FFRewReposTime(PlaySettings *settings) 1575 1711 { 1576 HostSpinBox *gs = new HostSpinBox("FFRewReposTime", 0, 200, 5);1712 CREATE_SPINBOX_SETTING(gs, "FFRewReposTime", settings, 0, 200, 5, false); 1577 1713 gs->setLabel(QObject::tr("Fast forward/rewind reposition amount")); 1578 1714 gs->setValue(100); 1579 1715 gs->setHelpText(QObject::tr("When exiting sticky keys fast forward/rewind " … … 1581 1717 "resuming normal playback. This " 1582 1718 "compensates for the reaction time between seeing " 1583 1719 "where to resume playback and actually exiting seeking.")); 1584 return gs;1720 return wrap(gs, settings); 1585 1721 } 1586 1722 1587 static HostCheckBox *FFRewReverse()1723 static Setting *FFRewReverse(PlaySettings *settings) 1588 1724 { 1589 HostCheckBox *gc = new HostCheckBox("FFRewReverse");1725 CREATE_CHECKBOX_SETTING(gc, "FFRewReverse", settings); 1590 1726 gc->setLabel(QObject::tr("Reverse direction in fast forward/rewind")); 1591 1727 gc->setValue(true); 1592 1728 gc->setHelpText(QObject::tr("If enabled, pressing the sticky rewind key " … … 1594 1730 "vice versa. If disabled, it will decrease the " 1595 1731 "current speed or switch to play mode if " 1596 1732 "the speed can't be decreased further.")); 1597 return gc;1733 return wrap(gc, settings); 1598 1734 } 1599 1735 1600 static HostSpinBox *OSDGeneralTimeout()1736 static Setting *OSDGeneralTimeout(PlaySettings *settings) 1601 1737 { 1602 HostSpinBox *gs = new HostSpinBox("OSDGeneralTimeout", 1, 30, 1);1738 CREATE_SPINBOX_SETTING(gs, "OSDGeneralTimeout", settings, 1, 30, 1, false); 1603 1739 gs->setLabel(QObject::tr("General OSD time-out (sec)")); 1604 1740 gs->setValue(2); 1605 1741 gs->setHelpText(QObject::tr("Length of time an on-screen display " 1606 1742 "window will be visible.")); 1607 return gs;1743 return wrap(gs, settings); 1608 1744 } 1609 1745 1610 static HostSpinBox *OSDProgramInfoTimeout()1746 static Setting *OSDProgramInfoTimeout(PlaySettings *settings) 1611 1747 { 1612 HostSpinBox *gs = new HostSpinBox("OSDProgramInfoTimeout", 1, 30, 1); 1748 CREATE_SPINBOX_SETTING(gs, "OSDProgramInfoTimeout", settings, 1749 1, 30, 1, false); 1613 1750 gs->setLabel(QObject::tr("Program Info OSD time-out")); 1614 1751 gs->setValue(3); 1615 1752 gs->setHelpText(QObject::tr("Length of time the on-screen display " 1616 1753 "will display program information.")); 1617 return gs;1754 return wrap(gs, settings); 1618 1755 } 1619 1756 1620 static HostSpinBox *OSDNotifyTimeout()1757 static Setting *OSDNotifyTimeout(PlaySettings *settings) 1621 1758 { 1622 HostSpinBox *gs = new HostSpinBox("OSDNotifyTimeout", 1, 30, 1);1759 CREATE_SPINBOX_SETTING(gs, "OSDNotifyTimeout", settings, 1, 30, 1, false); 1623 1760 gs->setLabel(QObject::tr("UDP Notify OSD time-out")); 1624 1761 gs->setValue(5); 1625 1762 gs->setHelpText(QObject::tr("How many seconds an on-screen display " 1626 1763 "will be active for UDP Notify events.")); 1627 return gs;1764 return wrap(gs, settings); 1628 1765 } 1629 1766 1630 1767 static HostSpinBox *ThemeCacheSize() … … 1668 1805 return gc; 1669 1806 } 1670 1807 1671 static HostComboBox *OSDFont()1808 static Setting *OSDFont(PlaySettings *settings) 1672 1809 { 1673 HostComboBox *gc = new HostComboBox("OSDFont");1810 CREATE_COMBOBOX_SETTING(gc, "OSDFont", settings); 1674 1811 gc->setLabel(QObject::tr("OSD font")); 1675 1812 QDir ttf(GetFontsDir(), GetFontsNameFilter()); 1676 1813 gc->fillSelectionsFromDir(ttf, false); … … 1678 1815 if (gc->findSelection(defaultOSDFont) > -1) 1679 1816 gc->setValue(defaultOSDFont); 1680 1817 1681 return gc;1818 return wrap(gc, settings); 1682 1819 } 1683 1820 1684 static HostComboBox *OSDCCFont()1821 static Setting *OSDCCFont(PlaySettings *settings) 1685 1822 { 1686 HostComboBox *gc = new HostComboBox("OSDCCFont");1823 CREATE_COMBOBOX_SETTING(gc, "OSDCCFont", settings); 1687 1824 gc->setLabel(QObject::tr("CC font")); 1688 1825 QDir ttf(GetFontsDir(), GetFontsNameFilter()); 1689 1826 gc->fillSelectionsFromDir(ttf, false); 1690 1827 gc->setHelpText(QObject::tr("Closed Caption font")); 1691 1828 1692 return gc;1829 return wrap(gc, settings); 1693 1830 } 1694 1831 1695 1832 static HostComboBox __attribute__ ((unused)) *DecodeVBIFormat() … … 1710 1847 return gc; 1711 1848 } 1712 1849 1713 static HostSpinBox *OSDCC708TextZoomPercentage(void)1850 static Setting *OSDCC708TextZoomPercentage(PlaySettings *settings) 1714 1851 { 1715 HostSpinBox *gs = new HostSpinBox("OSDCC708TextZoom", 50, 200, 5); 1852 CREATE_SPINBOX_SETTING(gs, "OSDCC708TextZoom", settings, 1853 50, 200, 5, false); 1716 1854 gs->setLabel(QObject::tr("Text zoom percentage")); 1717 1855 gs->setValue(100); 1718 1856 gs->setHelpText(QObject::tr("Use this to enlarge or shrink captions.")); 1719 1857 1720 return gs;1858 return wrap(gs, settings); 1721 1859 } 1722 1860 1723 static HostComboBox *OSDCC708DefaultFontType(void)1861 static Setting *OSDCC708DefaultFontType(PlaySettings *settings) 1724 1862 { 1725 HostComboBox *hc = new HostComboBox("OSDCC708DefaultFontType");1863 CREATE_COMBOBOX_SETTING(hc, "OSDCC708DefaultFontType", settings); 1726 1864 hc->setLabel(QObject::tr("Default Caption Font Type")); 1727 1865 hc->setHelpText( 1728 1866 QObject::tr("This allows you to set which font type to use " … … 1745 1883 }; 1746 1884 for (uint i = 0; i < 7; ++i) 1747 1885 hc->addSelection(typeNames[i], types[i]); 1748 return hc;1886 return wrap(hc, settings); 1749 1887 } 1750 1888 1751 static VerticalConfigurationGroup *OSDCC708Settings( void)1889 static VerticalConfigurationGroup *OSDCC708Settings(PlaySettings *settings) 1752 1890 { 1753 1891 VerticalConfigurationGroup *grp = 1754 1892 new VerticalConfigurationGroup(false, true, true, true); 1755 1893 grp->setLabel(QObject::tr("ATSC Caption Settings")); 1894 if (settings) 1895 grp->setLabel(QObject::tr("Playback group settings for ") + 1896 settings->mGroupName + " - " + 1897 grp->getLabel()); 1756 1898 1757 1899 // default text zoom 1.0 1758 grp->addChild(OSDCC708TextZoomPercentage( ));1900 grp->addChild(OSDCC708TextZoomPercentage(settings)); 1759 1901 1760 1902 // force X lines of captions 1761 1903 // force caption character color … … 1764 1906 // force background opacity 1765 1907 1766 1908 // set default font type 1767 grp->addChild(OSDCC708DefaultFontType( ));1909 grp->addChild(OSDCC708DefaultFontType(settings)); 1768 1910 1769 1911 return grp; 1770 1912 } 1771 1913 1772 static HostComboBox*OSDCC708Font(1914 static Setting *OSDCC708Font( 1773 1915 const QString &subtype, const QString &subtypeName, 1774 const QString &subtypeNameForHelp )1916 const QString &subtypeNameForHelp, PlaySettings *settings) 1775 1917 { 1776 HostComboBox *gc = new HostComboBox(1777 QString("OSDCC708%1Font").arg(subtype));1918 CREATE_COMBOBOX_SETTING(gc, QString("OSDCC708%1Font").arg(subtype), 1919 settings); 1778 1920 1779 1921 gc->setLabel(subtypeName); 1780 1922 QDir ttf(GetFontsDir(), GetFontsNameFilter()); … … 1782 1924 gc->setHelpText( 1783 1925 QObject::tr("ATSC %1 closed caption font.").arg(subtypeNameForHelp)); 1784 1926 1785 return gc;1927 return wrap(gc, settings, (subtypeName.length() > 10)); 1786 1928 } 1787 1929 1788 static HorizontalConfigurationGroup *OSDCC708Fonts( void)1930 static HorizontalConfigurationGroup *OSDCC708Fonts(PlaySettings *settings) 1789 1931 { 1790 1932 HorizontalConfigurationGroup *grpmain = 1791 1933 new HorizontalConfigurationGroup(false, true, true, true); 1792 1934 grpmain->setLabel(QObject::tr("ATSC Caption Fonts")); 1935 if (settings) 1936 grpmain->setLabel(QObject::tr("Playback group settings for ") + 1937 settings->mGroupName + " - " + 1938 grpmain->getLabel()); 1793 1939 VerticalConfigurationGroup *col[] = 1794 1940 { 1795 1941 new VerticalConfigurationGroup(false, false, true, true), … … 1825 1971 for (uint j = 0; j < 7; ++j) 1826 1972 { 1827 1973 col[i]->addChild(OSDCC708Font(subtypes[i].arg(types[j]), 1828 typeNames[j], typeNames[j])); 1974 typeNames[j], typeNames[j], 1975 settings)); 1829 1976 } 1830 1977 grpmain->addChild(col[i]); 1831 1978 1832 1979 i = 1; 1833 1980 for (uint j = 0; j < 7; ++j) 1834 1981 { 1835 col[i]->addChild(OSDCC708Font( 1836 subtypes[i].arg(types[j]), "", 1837 QObject::tr("Italic") + ' ' + typeNames[j])); 1982 col[i]->addChild(OSDCC708Font(subtypes[i].arg(types[j]), 1983 (settings ? typeNames[j] : ""), 1984 QObject::tr("Italic") + ' ' + typeNames[j], 1985 settings)); 1838 1986 } 1839 1987 1840 1988 grpmain->addChild(col[i]); … … 1842 1990 return grpmain; 1843 1991 } 1844 1992 1845 static HostComboBox *SubtitleCodec()1993 static Setting *SubtitleCodec(PlaySettings *settings) 1846 1994 { 1847 HostComboBox *gc = new HostComboBox("SubtitleCodec");1995 CREATE_COMBOBOX_SETTING(gc, "SubtitleCodec", settings); 1848 1996 1849 1997 gc->setLabel(QObject::tr("Subtitle Codec")); 1850 1998 QList<QByteArray> list = QTextCodec::availableCodecs(); … … 1854 2002 gc->addSelection(val, val, val.toLower() == "utf-8"); 1855 2003 } 1856 2004 1857 return gc;2005 return wrap(gc, settings); 1858 2006 } 1859 2007 1860 static HorizontalConfigurationGroup *ExternalSubtitleSettings( )2008 static HorizontalConfigurationGroup *ExternalSubtitleSettings(PlaySettings *settings) 1861 2009 { 1862 2010 HorizontalConfigurationGroup *grpmain = 1863 2011 new HorizontalConfigurationGroup(false, true, true, true); 1864 2012 1865 2013 grpmain->setLabel(QObject::tr("External Subtitle Settings")); 1866 2014 1867 grpmain->addChild(SubtitleCodec( ));2015 grpmain->addChild(SubtitleCodec(settings)); 1868 2016 1869 2017 return grpmain; 1870 2018 } 1871 2019 1872 static HostComboBox *OSDThemeFontSizeType()2020 static Setting *OSDThemeFontSizeType(PlaySettings *settings) 1873 2021 { 1874 HostComboBox *gc = new HostComboBox("OSDThemeFontSizeType");2022 CREATE_COMBOBOX_SETTING(gc, "OSDThemeFontSizeType", settings); 1875 2023 gc->setLabel(QObject::tr("Font size")); 1876 2024 gc->addSelection(QObject::tr("default"), "default"); 1877 2025 gc->addSelection(QObject::tr("small"), "small"); 1878 2026 gc->addSelection(QObject::tr("big"), "big"); 1879 2027 gc->setHelpText(QObject::tr("default: TV, small: monitor, big:")); 1880 return gc;2028 return wrap(gc, settings); 1881 2029 } 1882 2030 1883 2031 static HostComboBox *ChannelOrdering() … … 1889 2037 return gc; 1890 2038 } 1891 2039 1892 static HostSpinBox *VertScanPercentage()2040 static Setting *VertScanPercentage(PlaySettings *settings) 1893 2041 { 1894 HostSpinBox *gs = new HostSpinBox("VertScanPercentage", -100, 100, 1); 2042 CREATE_SPINBOX_SETTING(gs, "VertScanPercentage", settings, 2043 -100, 100, 1, false); 1895 2044 gs->setLabel(QObject::tr("Vertical scaling")); 1896 2045 gs->setValue(0); 1897 2046 gs->setHelpText(QObject::tr( 1898 2047 "Adjust this if the image does not fill your " 1899 2048 "screen vertically. Range -100% to 100%")); 1900 return gs;2049 return wrap(gs, settings); 1901 2050 } 1902 2051 1903 static HostSpinBox *HorizScanPercentage()2052 static Setting *HorizScanPercentage(PlaySettings *settings) 1904 2053 { 1905 HostSpinBox *gs = new HostSpinBox("HorizScanPercentage", -100, 100, 1); 2054 CREATE_SPINBOX_SETTING(gs, "HorizScanPercentage", settings, 2055 -100, 100, 1, false); 1906 2056 gs->setLabel(QObject::tr("Horizontal scaling")); 1907 2057 gs->setValue(0); 1908 2058 gs->setHelpText(QObject::tr( 1909 2059 "Adjust this if the image does not fill your " 1910 2060 "screen horizontally. Range -100% to 100%")); 1911 return gs;2061 return wrap(gs, settings); 1912 2062 }; 1913 2063 1914 static HostSpinBox *XScanDisplacement()2064 static Setting *XScanDisplacement(PlaySettings *settings) 1915 2065 { 1916 HostSpinBox *gs = new HostSpinBox("XScanDisplacement", -50, 50, 1); 2066 CREATE_SPINBOX_SETTING(gs, "XScanDisplacement", settings, 2067 -50, 50, 1, false); 1917 2068 gs->setLabel(QObject::tr("Scan displacement (X)")); 1918 2069 gs->setValue(0); 1919 2070 gs->setHelpText(QObject::tr("Adjust this to move the image horizontally.")); 1920 return gs;2071 return wrap(gs, settings); 1921 2072 } 1922 2073 1923 static HostSpinBox *YScanDisplacement()2074 static Setting *YScanDisplacement(PlaySettings *settings) 1924 2075 { 1925 HostSpinBox *gs = new HostSpinBox("YScanDisplacement", -50, 50, 1); 2076 CREATE_SPINBOX_SETTING(gs, "YScanDisplacement", settings, 2077 -50, 50, 1, false); 1926 2078 gs->setLabel(QObject::tr("Scan displacement (Y)")); 1927 2079 gs->setValue(0); 1928 2080 gs->setHelpText(QObject::tr("Adjust this to move the image vertically.")); 1929 return gs;2081 return wrap(gs, settings); 1930 2082 }; 1931 2083 1932 2084 static HostCheckBox *AlwaysStreamFiles() … … 1942 2094 return gc; 1943 2095 } 1944 2096 1945 static HostCheckBox *CCBackground()2097 static Setting *CCBackground(PlaySettings *settings) 1946 2098 { 1947 HostCheckBox *gc = new HostCheckBox("CCBackground");2099 CREATE_CHECKBOX_SETTING(gc, "CCBackground", settings); 1948 2100 gc->setLabel(QObject::tr("Black background for closed captioning")); 1949 2101 gc->setValue(false); 1950 2102 gc->setHelpText(QObject::tr( 1951 2103 "If enabled, captions will be displayed " 1952 2104 "as white text over a black background " 1953 2105 "for better contrast.")); 1954 return gc;2106 return wrap(gc, settings); 1955 2107 } 1956 2108 1957 static HostCheckBox *DefaultCCMode()2109 static Setting *DefaultCCMode(PlaySettings *settings) 1958 2110 { 1959 HostCheckBox *gc = new HostCheckBox("DefaultCCMode");2111 CREATE_CHECKBOX_SETTING(gc, "DefaultCCMode", settings); 1960 2112 gc->setLabel(QObject::tr("Always display closed captioning or subtitles")); 1961 2113 gc->setValue(false); 1962 2114 gc->setHelpText(QObject::tr( … … 1964 2116 "when playing back recordings or watching " 1965 2117 "live TV. Closed Captioning can be turned on or off " 1966 2118 "by pressing \"T\" during playback.")); 1967 return gc;2119 return wrap(gc, settings); 1968 2120 } 1969 2121 1970 static HostCheckBox *PreferCC708()2122 static Setting *PreferCC708(PlaySettings *settings) 1971 2123 { 1972 HostCheckBox *gc = new HostCheckBox("Prefer708Captions");2124 CREATE_CHECKBOX_SETTING(gc, "Prefer708Captions", settings); 1973 2125 gc->setLabel(QObject::tr("Prefer EIA-708 over EIA-608 captions")); 1974 2126 gc->setValue(true); 1975 2127 gc->setHelpText( … … 1977 2129 "When enabled the new EIA-708 captions will be preferred over " 1978 2130 "the old EIA-608 captions in ATSC streams.")); 1979 2131 1980 return gc;2132 return wrap(gc, settings); 1981 2133 } 1982 2134 1983 static HostCheckBox *EnableMHEG()2135 static Setting *EnableMHEG(PlaySettings *settings) 1984 2136 { 1985 HostCheckBox *gc = new HostCheckBox("EnableMHEG");2137 CREATE_CHECKBOX_SETTING(gc, "EnableMHEG", settings); 1986 2138 gc->setLabel(QObject::tr("Enable Interactive TV")); 1987 2139 gc->setValue(false); 1988 2140 gc->setHelpText(QObject::tr( 1989 2141 "If enabled, interactive TV applications (MHEG) will " 1990 2142 "be activated. This is used for teletext and logos for " 1991 2143 "radio and channels that are currently off-air.")); 1992 return gc;2144 return wrap(gc, settings); 1993 2145 } 1994 2146 1995 static HostCheckBox *PersistentBrowseMode()2147 static Setting *PersistentBrowseMode(PlaySettings *settings) 1996 2148 { 1997 HostCheckBox *gc = new HostCheckBox("PersistentBrowseMode");2149 CREATE_CHECKBOX_SETTING(gc, "PersistentBrowseMode", settings); 1998 2150 gc->setLabel(QObject::tr("Always use Browse mode in LiveTV")); 1999 2151 gc->setValue(true); 2000 2152 gc->setHelpText( 2001 2153 QObject::tr( 2002 2154 "If enabled, Browse mode will automatically be activated " 2003 2155 "whenever you use Channel UP/DOWN while watching Live TV.")); 2004 return gc;2156 return wrap(gc, settings); 2005 2157 } 2006 2158 2007 static HostCheckBox *BrowseAllTuners()2159 static Setting *BrowseAllTuners(PlaySettings *settings) 2008 2160 { 2009 HostCheckBox *gc = new HostCheckBox("BrowseAllTuners");2161 CREATE_CHECKBOX_SETTING(gc, "BrowseAllTuners", settings); 2010 2162 gc->setLabel(QObject::tr("Browse all channels")); 2011 2163 gc->setValue(false); 2012 2164 gc->setHelpText( … … 2014 2166 "If enabled, browse mode will shows channels on all " 2015 2167 "available recording devices, instead of showing " 2016 2168 "channels on just the current recorder.")); 2017 return gc;2169 return wrap(gc, settings); 2018 2170 } 2019 2171 2020 static HostCheckBox *ClearSavedPosition()2172 static Setting *ClearSavedPosition(PlaySettings *settings) 2021 2173 { 2022 HostCheckBox *gc = new HostCheckBox("ClearSavedPosition");2174 CREATE_CHECKBOX_SETTING(gc, "ClearSavedPosition", settings); 2023 2175 gc->setLabel(QObject::tr("Clear bookmark on playback")); 2024 2176 gc->setValue(true); 2025 2177 gc->setHelpText(QObject::tr("Automatically clear the bookmark on a " 2026 2178 "recording when the recording is played back. If " 2027 2179 "disabled, you can mark the beginning with rewind " 2028 2180 "then save position.")); 2029 return gc;2181 return wrap(gc, settings); 2030 2182 } 2031 2183 2032 static HostCheckBox *AltClearSavedPosition()2184 static Setting *AltClearSavedPosition(PlaySettings *settings) 2033 2185 { 2034 HostCheckBox *gc = new HostCheckBox("AltClearSavedPosition");2186 CREATE_CHECKBOX_SETTING(gc, "AltClearSavedPosition", settings); 2035 2187 gc->setLabel(QObject::tr("Alternate clear and save bookmark")); 2036 2188 gc->setValue(true); 2037 2189 gc->setHelpText(QObject::tr("During playback the Select key " … … 2039 2191 "Saved\" and \"Bookmark Cleared\". If disabled, the " 2040 2192 "Select key will save the current position for each " 2041 2193 "keypress.")); 2042 return gc;2194 return wrap(gc, settings); 2043 2195 } 2044 2196 2045 2197 #if defined(USING_XV) || defined(USING_OPENGL_VIDEO) || defined(USING_VDPAU) 2046 static HostCheckBox *UsePicControls()2198 static Setting *UsePicControls(PlaySettings *settings) 2047 2199 { 2048 HostCheckBox *gc = new HostCheckBox("UseOutputPictureControls");2200 CREATE_CHECKBOX_SETTING(gc, "UseOutputPictureControls", settings); 2049 2201 gc->setLabel(QObject::tr("Enable picture controls")); 2050 2202 gc->setValue(false); 2051 2203 gc->setHelpText( 2052 2204 QObject::tr( 2053 2205 "If enabled, MythTV attempts to initialize picture controls " 2054 2206 "(brightness, contrast, etc.) that are applied during playback.")); 2055 return gc;2207 return wrap(gc, settings); 2056 2208 } 2057 2209 #endif 2058 2210 2059 static HostLineEdit *UDPNotifyPort()2211 static Setting *UDPNotifyPort(PlaySettings *settings) 2060 2212 { 2061 HostLineEdit *ge = new HostLineEdit("UDPNotifyPort");2213 CREATE_LINEEDIT_SETTING(ge, "UDPNotifyPort", settings); 2062 2214 ge->setLabel(QObject::tr("UDP Notify Port")); 2063 2215 ge->setValue("6948"); 2064 2216 ge->setHelpText(QObject::tr("During playback, MythTV will listen for " 2065 2217 "connections from the \"mythtvosd\" or \"mythudprelay\" " 2066 2218 "programs on this port. See the README in " 2067 2219 "contrib/mythnotify/ for additional information.")); 2068 return ge;2220 return wrap(ge, settings); 2069 2221 } 2070 2222 2071 static HostComboBox *PlaybackExitPrompt()2223 static Setting *PlaybackExitPrompt(PlaySettings *settings) 2072 2224 { 2073 HostComboBox *gc = new HostComboBox("PlaybackExitPrompt");2225 CREATE_COMBOBOX_SETTING(gc, "PlaybackExitPrompt", settings); 2074 2226 gc->setLabel(QObject::tr("Action on playback exit")); 2075 2227 gc->addSelection(QObject::tr("Just exit"), "0"); 2076 2228 gc->addSelection(QObject::tr("Save position and exit"), "2"); … … 2081 2233 "when you exit playback mode. The options available will " 2082 2234 "allow you to save your position, delete the " 2083 2235 "recording, or continue watching.")); 2084 return gc;2236 return wrap(gc, settings); 2085 2237 } 2086 2238 2087 static HostCheckBox *EndOfRecordingExitPrompt()2239 static Setting *EndOfRecordingExitPrompt(PlaySettings *settings) 2088 2240 { 2089 HostCheckBox *gc = new HostCheckBox("EndOfRecordingExitPrompt");2241 CREATE_CHECKBOX_SETTING(gc, "EndOfRecordingExitPrompt", settings); 2090 2242 gc->setLabel(QObject::tr("Prompt at end of recording")); 2091 2243 gc->setValue(false); 2092 2244 gc->setHelpText(QObject::tr("If set, a menu will be displayed allowing " 2093 2245 "you to delete the recording when it has finished " 2094 2246 "playing.")); 2095 return gc;2247 return wrap(gc, settings); 2096 2248 } 2097 2249 2098 static HostCheckBox *JumpToProgramOSD()2250 static Setting *JumpToProgramOSD(PlaySettings *settings) 2099 2251 { 2100 HostCheckBox *gc = new HostCheckBox("JumpToProgramOSD");2252 CREATE_CHECKBOX_SETTING(gc, "JumpToProgramOSD", settings); 2101 2253 gc->setLabel(QObject::tr("Jump to Program OSD")); 2102 2254 gc->setValue(true); 2103 2255 gc->setHelpText(QObject::tr( … … 2106 2258 "'Watch Recording' screen when 'Jump to Program' " 2107 2259 "is activated. If set, the recordings are shown " 2108 2260 "in the OSD")); 2109 return gc;2261 return wrap(gc, settings); 2110 2262 } 2111 2263 2112 static HostCheckBox *ContinueEmbeddedTVPlay()2264 static Setting *ContinueEmbeddedTVPlay(PlaySettings *settings) 2113 2265 { 2114 HostCheckBox *gc = new HostCheckBox("ContinueEmbeddedTVPlay");2266 CREATE_CHECKBOX_SETTING(gc, "ContinueEmbeddedTVPlay", settings); 2115 2267 gc->setLabel(QObject::tr("Continue Playback When Embedded")); 2116 2268 gc->setValue(false); 2117 2269 gc->setHelpText(QObject::tr( … … 2119 2271 "is embedded in the upcoming program list or recorded " 2120 2272 "list. The default is to pause the recorded show when " 2121 2273 "embedded.")); 2122 return gc;2274 return wrap(gc, settings); 2123 2275 } 2124 2276 2125 static HostCheckBox *AutomaticSetWatched()2277 static Setting *AutomaticSetWatched(PlaySettings *settings) 2126 2278 { 2127 HostCheckBox *gc = new HostCheckBox("AutomaticSetWatched");2279 CREATE_CHECKBOX_SETTING(gc, "AutomaticSetWatched", settings); 2128 2280 gc->setLabel(QObject::tr("Automatically mark a recording as watched")); 2129 2281 gc->setValue(false); 2130 2282 gc->setHelpText(QObject::tr("If set, when you exit near the end of a " … … 2132 2284 "detection is not foolproof, so do not enable this " 2133 2285 "setting if you don't want an unwatched recording marked " 2134 2286 "as watched.")); 2135 return gc;2287 return wrap(gc, settings); 2136 2288 } 2137 2289 2138 2290 static HostSpinBox *LiveTVIdleTimeout() … … 2369 2521 return gc; 2370 2522 } 2371 2523 2372 static HostComboBox *LetterboxingColour()2524 static Setting *LetterboxingColour(PlaySettings *settings) 2373 2525 { 2374 HostComboBox *gc = new HostComboBox("LetterboxColour");2526 CREATE_COMBOBOX_SETTING(gc, "LetterboxColour", settings); 2375 2527 gc->setLabel(QObject::tr("Letterboxing Color")); 2376 2528 for (int m = kLetterBoxColour_Black; m < kLetterBoxColour_END; ++m) 2377 2529 gc->addSelection(toString((LetterBoxColour)m), QString::number(m)); … … 2381 2533 "letterboxing, but those with plasma screens may prefer gray " 2382 2534 "to minimize burn-in.") + " " + 2383 2535 QObject::tr("Currently only works with XVideo video renderer.")); 2384 return gc;2536 return wrap(gc, settings); 2385 2537 } 2386 2538 2387 static HostComboBox *AspectOverride()2539 static Setting *AspectOverride(PlaySettings *settings) 2388 2540 { 2389 HostComboBox *gc = new HostComboBox("AspectOverride");2541 CREATE_COMBOBOX_SETTING(gc, "AspectOverride", settings); 2390 2542 gc->setLabel(QObject::tr("Video Aspect Override")); 2391 2543 for (int m = kAspect_Off; m < kAspect_END; ++m) 2392 2544 gc->addSelection(toString((AspectOverrideMode)m), QString::number(m)); … … 2394 2546 "When enabled, these will override the aspect " 2395 2547 "ratio specified by any broadcaster for all " 2396 2548 "video streams.")); 2397 return gc;2549 return wrap(gc, settings); 2398 2550 } 2399 2551 2400 static HostComboBox *AdjustFill()2552 static Setting *AdjustFill(PlaySettings *settings) 2401 2553 { 2402 HostComboBox *gc = new HostComboBox("AdjustFill");2554 CREATE_COMBOBOX_SETTING(gc, "AdjustFill", settings); 2403 2555 gc->setLabel(QObject::tr("Zoom")); 2404 2556 gc->addSelection(toString(kAdjustFill_AutoDetect_DefaultOff), 2405 2557 QString::number(kAdjustFill_AutoDetect_DefaultOff)); … … 2410 2562 gc->setHelpText(QObject::tr( 2411 2563 "When enabled, these will apply a predefined " 2412 2564 "zoom to all video playback in MythTV.")); 2413 return gc;2565 return wrap(gc, settings); 2414 2566 } 2415 2567 2416 2568 // Theme settings … … 2829 2981 return gc; 2830 2982 } 2831 2983 2832 ThemeSelector::ThemeSelector(QString label): 2833 HostImageSelect(label){2834 2984 static Setting *ThemeSelector(QString label, PlaySettings *settings=NULL) 2985 { 2986 CREATE_IMAGESELECT_SETTING(gs, label, settings); 2835 2987 ThemeType themetype = THEME_UI; 2836 2988 2837 2989 if (label == "Theme") 2838 2990 { 2839 2991 themetype = THEME_UI; 2840 setLabel(QObject::tr("UI Theme"));2992 gs->setLabel(QObject::tr("UI Theme")); 2841 2993 } 2842 2994 else if (label == "OSDTheme") 2843 2995 { 2844 2996 themetype = THEME_OSD; 2845 setLabel(QObject::tr("OSD Theme"));2997 gs->setLabel(QObject::tr("OSD Theme")); 2846 2998 } 2847 2999 else if (label == "MenuTheme") 2848 3000 { 2849 3001 themetype = THEME_MENU; 2850 setLabel(QObject::tr("Menu Theme"));3002 gs->setLabel(QObject::tr("Menu Theme")); 2851 3003 } 2852 3004 2853 3005 QDir themes(GetThemesParentDir()); … … 2911 3063 VERBOSE(VB_IMPORTANT, QString("Problem reading theme preview image" 2912 3064 " %1").arg(preview.filePath())); 2913 3065 2914 addImageSelection(name, previewImage, theme.fileName());3066 gs->addImageSelection(name, previewImage, theme.fileName()); 2915 3067 } 2916 3068 2917 3069 if (themetype & THEME_UI) 2918 setValue(DEFAULT_UI_THEME);3070 gs->setValue(DEFAULT_UI_THEME); 2919 3071 else if (themetype & THEME_OSD) 2920 setValue("BlackCurves-OSD"); 3072 gs->setValue("BlackCurves-OSD"); 3073 3074 return wrap(gs, settings); 2921 3075 } 2922 3076 2923 3077 static HostComboBox *ChannelFormat() … … 3404 3558 3405 3559 addTarget("6", group); 3406 3560 addTarget("2", new VerticalConfigurationGroup(false, true)); 3561 QString dflt = getDefault(checkbox); 3562 if (!dflt.isEmpty()) 3563 addTarget(dflt, group); 3407 3564 } 3408 3565 }; 3409 3566 … … 3417 3574 3418 3575 addTarget("1", group); 3419 3576 addTarget("0", new VerticalConfigurationGroup(false, true)); 3577 QString dflt = getDefault(checkbox); 3578 if (!dflt.isEmpty()) 3579 addTarget(dflt, group); 3420 3580 } 3421 3581 }; 3422 3582 … … 3431 3591 3432 3592 addTarget("1", setting); 3433 3593 addTarget("0", new VerticalConfigurationGroup(false, false)); 3594 QString dflt = getDefault(checkbox); 3595 if (!dflt.isEmpty()) 3596 addTarget(dflt, setting); 3434 3597 } 3435 3598 }; 3436 3599 3437 static ConfigurationGroup *AudioSystemSettingsGroup( )3600 static ConfigurationGroup *AudioSystemSettingsGroup(PlaySettings *settings) 3438 3601 { 3439 3602 ConfigurationGroup *vcg = new VerticalConfigurationGroup(false, true, false, false); 3440 3603 3441 3604 vcg->setLabel(QObject::tr("Audio System")); 3442 3605 vcg->setUseLabel(false); 3443 3606 3444 vcg->addChild(new AudioOutputDevice()); 3607 if (!settings) 3608 vcg->addChild(new AudioOutputDevice()); 3445 3609 3446 Setting *numchannels = MaxAudioChannels( );3610 Setting *numchannels = MaxAudioChannels(settings); 3447 3611 vcg->addChild(numchannels); 3448 3612 3449 3613 ConfigurationGroup *group1 = 3450 3614 new VerticalConfigurationGroup(false, true, false, false); 3451 3615 3452 group1->addChild(AudioUpmix( ));3453 group1->addChild(AudioUpmixType( ));3454 group1->addChild(PassThroughOutputDevice( ));3616 group1->addChild(AudioUpmix(settings)); 3617 group1->addChild(AudioUpmixType(settings)); 3618 group1->addChild(PassThroughOutputDevice(settings)); 3455 3619 3456 3620 ConfigurationGroup *settings1 = 3457 3621 new HorizontalConfigurationGroup(); 3458 3622 settings1->setLabel(QObject::tr("Audio Processing Capabilities")); 3459 settings1->addChild(AC3PassThrough( ));3460 settings1->addChild(DTSPassThrough( ));3623 settings1->addChild(AC3PassThrough(settings)); 3624 settings1->addChild(DTSPassThrough(settings)); 3461 3625 3462 3626 group1->addChild(settings1); 3463 3627 … … 3466 3630 new AudioSystemSurroundGroup(numchannels, group1); 3467 3631 vcg->addChild(sub1); 3468 3632 3469 Setting *advancedsettings = AdvancedAudioSettings( );3633 Setting *advancedsettings = AdvancedAudioSettings(settings); 3470 3634 vcg->addChild(advancedsettings); 3471 3635 3472 3636 ConfigurationGroup *group2 = … … 3479 3643 ConfigurationGroup *settings2 = 3480 3644 new HorizontalConfigurationGroup(false, false, false, false); 3481 3645 3482 Setting *srcqualityoverride = SRCQualityOverride( );3646 Setting *srcqualityoverride = SRCQualityOverride(settings); 3483 3647 3484 3648 AudioSystemAdvancedSettings *sub3 = 3485 new AudioSystemAdvancedSettings(srcqualityoverride, SRCQuality()); 3649 new AudioSystemAdvancedSettings(srcqualityoverride, 3650 SRCQuality(settings)); 3486 3651 settings2->addChild(srcqualityoverride); 3487 3652 settings2->addChild(sub3); 3488 3653 3489 3654 group2->addChild(settings2); 3490 group2->addChild(AggressiveBuffer( ));3655 group2->addChild(AggressiveBuffer(settings)); 3491 3656 3492 3657 return vcg; 3493 3658 … … 3496 3661 class AudioMixerSettingsGroup : public TriggeredConfigurationGroup 3497 3662 { 3498 3663 public: 3499 AudioMixerSettingsGroup( ) :3664 AudioMixerSettingsGroup(PlaySettings *psettings) : 3500 3665 TriggeredConfigurationGroup(false, true, false, false) 3501 3666 { 3502 3667 setLabel(QObject::tr("Audio Mixer")); 3503 3668 setUseLabel(false); 3504 3669 3505 Setting *volumeControl = MythControlsVolume( );3670 Setting *volumeControl = MythControlsVolume(psettings); 3506 3671 addChild(volumeControl); 3507 3672 3508 3673 // Mixer settings 3509 3674 ConfigurationGroup *settings = 3510 3675 new VerticalConfigurationGroup(false, true, false, false); 3511 settings->addChild(MixerDevice( ));3512 settings->addChild(MixerControl( ));3513 settings->addChild(MixerVolume( ));3514 settings->addChild(PCMVolume( ));3515 settings->addChild(IndividualMuteControl( ));3676 settings->addChild(MixerDevice(psettings)); 3677 settings->addChild(MixerControl(psettings)); 3678 settings->addChild(MixerVolume(psettings)); 3679 settings->addChild(PCMVolume(psettings)); 3680 settings->addChild(IndividualMuteControl(psettings)); 3516 3681 3517 3682 ConfigurationGroup *dummy = 3518 3683 new VerticalConfigurationGroup(false, true, false, false); … … 3521 3686 setTrigger(volumeControl); 3522 3687 addTarget("0", dummy); 3523 3688 addTarget("1", settings); 3689 QString dflt = getDefault(volumeControl); 3690 if (!dflt.isEmpty()) 3691 addTarget(dflt, settings); 3524 3692 } 3525 3693 }; 3526 3694 … … 3594 3762 return gs; 3595 3763 } 3596 3764 3597 static HostCheckBox *RealtimePriority()3765 static Setting *RealtimePriority(PlaySettings *settings) 3598 3766 { 3599 HostCheckBox *gc = new HostCheckBox("RealtimePriority");3767 CREATE_CHECKBOX_SETTING(gc, "RealtimePriority", settings); 3600 3768 gc->setLabel(QObject::tr("Enable realtime priority threads")); 3601 3769 gc->setHelpText(QObject::tr("When running mythfrontend with root " 3602 3770 "privileges, some threads can be given enhanced priority. " 3603 3771 "Disable this if mythfrontend freezes during video " 3604 3772 "playback.")); 3605 3773 gc->setValue(true); 3606 return gc;3774 return wrap(gc, settings, false); 3607 3775 } 3608 3776 3609 3777 static HostCheckBox *EnableMediaMon() … … 3759 3927 }; 3760 3928 3761 3929 #ifdef USING_OPENGL_VSYNC 3762 static HostCheckBox *UseOpenGLVSync()3930 static Setting *UseOpenGLVSync(PlaySettings *settings) 3763 3931 { 3764 HostCheckBox *gc = new HostCheckBox("UseOpenGLVSync");3932 CREATE_CHECKBOX_SETTING(gc, "UseOpenGLVSync", settings); 3765 3933 gc->setLabel(QObject::tr("Enable OpenGL vertical sync for timing")); 3766 3934 gc->setValue(false); 3767 3935 gc->setHelpText(QObject::tr( 3768 3936 "If it is supported by your hardware/drivers, " 3769 3937 "MythTV will use OpenGL vertical syncing for " 3770 3938 "video timing, reducing frame jitter.")); 3771 return gc;3939 return wrap(gc, settings); 3772 3940 } 3773 3941 #endif 3774 3942 … … 4194 4362 return gc; 4195 4363 } 4196 4364 4197 MainGeneralSettings::MainGeneralSettings() 4365 MainGeneralSettings::MainGeneralSettings(PlaySettings *settings, 4366 ConfigurationWizard *base) 4198 4367 { 4368 if (!settings) 4369 { 4199 4370 DatabaseSettings::addDatabaseSettings(this); 4200 4371 4201 4372 VerticalConfigurationGroup *pin = … … 4204 4375 pin->addChild(SetupPinCodeRequired()); 4205 4376 pin->addChild(SetupPinCode()); 4206 4377 addChild(pin); 4378 } 4207 4379 4208 addChild(AudioSystemSettingsGroup()); 4380 if (base) 4381 { 4382 base->addChild(AudioSystemSettingsGroup(settings)); 4383 base->addChild(new AudioMixerSettingsGroup(settings)); 4384 } 4385 else 4386 { 4387 addChild(AudioSystemSettingsGroup(settings)); 4388 addChild(new AudioMixerSettingsGroup(settings)); 4389 } 4209 4390 4210 addChild(new AudioMixerSettingsGroup());4211 4391 4392 if (!settings) 4393 { 4212 4394 VerticalConfigurationGroup *general = 4213 4395 new VerticalConfigurationGroup(false, true, false, false); 4214 4396 general->setLabel(QObject::tr("General")); … … 4247 4429 remotecontrol->addChild(NetworkControlEnabled()); 4248 4430 remotecontrol->addChild(NetworkControlPort()); 4249 4431 addChild(remotecontrol); 4432 } 4250 4433 } 4251 4434 4252 PlaybackSettings::PlaybackSettings() 4435 PlaybackSettings::PlaybackSettings(PlaySettings *settings, 4436 ConfigurationWizard *base) 4253 4437 { 4254 4438 uint i = 0, total = 8; 4255 4439 #if CONFIG_DARWIN 4256 4440 total += 2; 4257 4441 #endif // USING_DARWIN 4442 if (settings) 4443 total -= 3; 4258 4444 4259 4445 4260 4446 VerticalConfigurationGroup* general1 = 4261 4447 new VerticalConfigurationGroup(false); 4262 4448 general1->setLabel(QObject::tr("General Playback") + 4263 4449 QString(" (%1/%2)").arg(++i).arg(total)); 4450 if (settings) 4451 general1->setLabel(QObject::tr("Playback group settings for ") + 4452 settings->mGroupName + " - " + 4453 general1->getLabel()); 4264 4454 4265 4455 HorizontalConfigurationGroup *columns = 4266 4456 new HorizontalConfigurationGroup(false, false, true, true); 4267 4457 4268 4458 VerticalConfigurationGroup *column1 = 4269 4459 new VerticalConfigurationGroup(false, false, true, true); 4270 column1->addChild(RealtimePriority()); 4271 column1->addChild(DecodeExtraAudio()); 4272 column1->addChild(JumpToProgramOSD()); 4460 if (!settings) 4461 column1->addChild(RealtimePriority(settings)); 4462 column1->addChild(DecodeExtraAudio(settings)); 4463 column1->addChild(JumpToProgramOSD(settings)); 4273 4464 columns->addChild(column1); 4274 4465 4275 4466 VerticalConfigurationGroup *column2 = 4276 4467 new VerticalConfigurationGroup(false, false, true, true); 4277 column2->addChild(ClearSavedPosition( ));4278 column2->addChild(AltClearSavedPosition( ));4279 column2->addChild(AutomaticSetWatched( ));4280 column2->addChild(ContinueEmbeddedTVPlay( ));4468 column2->addChild(ClearSavedPosition(settings)); 4469 column2->addChild(AltClearSavedPosition(settings)); 4470 column2->addChild(AutomaticSetWatched(settings)); 4471 column2->addChild(ContinueEmbeddedTVPlay(settings)); 4281 4472 columns->addChild(column2); 4282 4473 4283 4474 general1->addChild(columns); 4284 general1->addChild(LiveTVIdleTimeout()); 4285 general1->addChild(AlwaysStreamFiles()); 4475 if (!settings) 4476 general1->addChild(LiveTVIdleTimeout()); 4477 if (!settings) 4478 general1->addChild(AlwaysStreamFiles()); 4286 4479 #ifdef USING_OPENGL_VSYNC 4287 general1->addChild(UseOpenGLVSync( ));4480 general1->addChild(UseOpenGLVSync(settings)); 4288 4481 #endif // USING_OPENGL_VSYNC 4289 4482 #if defined(USING_XV) || defined(USING_OPENGL_VIDEO) || defined(USING_VDPAU) 4290 general1->addChild(UsePicControls( ));4483 general1->addChild(UsePicControls(settings)); 4291 4484 #endif // USING_XV 4292 addChild(general1); 4485 if (base) 4486 base->addChild(general1); 4487 else 4488 addChild(general1); 4293 4489 4294 4490 VerticalConfigurationGroup* general2 = 4295 4491 new VerticalConfigurationGroup(false); 4296 4492 general2->setLabel(QObject::tr("General Playback") + 4297 4493 QString(" (%1/%2)").arg(++i).arg(total)); 4494 if (settings) 4495 general2->setLabel(QObject::tr("Playback group settings for ") + 4496 settings->mGroupName + " - " + 4497 general2->getLabel()); 4298 4498 4299 4499 HorizontalConfigurationGroup* oscan = 4300 4500 new HorizontalConfigurationGroup(false, false, true, true); … … 4302 4502 new VerticalConfigurationGroup(false, false, true, true); 4303 4503 VerticalConfigurationGroup *ocol2 = 4304 4504 new VerticalConfigurationGroup(false, false, true, true); 4305 ocol1->addChild(VertScanPercentage( ));4306 ocol1->addChild(YScanDisplacement( ));4307 ocol2->addChild(HorizScanPercentage( ));4308 ocol2->addChild(XScanDisplacement( ));4505 ocol1->addChild(VertScanPercentage(settings)); 4506 ocol1->addChild(YScanDisplacement(settings)); 4507 ocol2->addChild(HorizScanPercentage(settings)); 4508 ocol2->addChild(XScanDisplacement(settings)); 4309 4509 oscan->addChild(ocol1); 4310 4510 oscan->addChild(ocol2); 4311 4511 4312 4512 HorizontalConfigurationGroup* aspect_fill = 4313 4513 new HorizontalConfigurationGroup(false, false, true, true); 4314 aspect_fill->addChild(AspectOverride( ));4315 aspect_fill->addChild(AdjustFill( ));4514 aspect_fill->addChild(AspectOverride(settings)); 4515 aspect_fill->addChild(AdjustFill(settings)); 4316 4516 4317 4517 general2->addChild(oscan); 4318 4518 general2->addChild(aspect_fill); 4319 general2->addChild(LetterboxingColour()); 4320 general2->addChild(PIPLocationComboBox()); 4321 general2->addChild(PlaybackExitPrompt()); 4322 general2->addChild(EndOfRecordingExitPrompt()); 4323 addChild(general2); 4519 general2->addChild(LetterboxingColour(settings)); 4520 general2->addChild(PIPLocationComboBox(settings)); 4521 general2->addChild(PlaybackExitPrompt(settings)); 4522 general2->addChild(EndOfRecordingExitPrompt(settings)); 4523 if (base) 4524 base->addChild(general2); 4525 else 4526 addChild(general2); 4324 4527 4325 4528 QString tmp = QString(" (%1/%2)").arg(++i).arg(total); 4326 addChild(new PlaybackProfileConfigs(tmp)); 4529 if (base) 4530 base->addChild(new PlaybackProfileConfigs(tmp, settings)); 4531 else 4532 addChild(new PlaybackProfileConfigs(tmp, settings)); 4327 4533 4534 if (!settings) 4535 { 4328 4536 VerticalConfigurationGroup* pbox = new VerticalConfigurationGroup(false); 4329 4537 pbox->setLabel(QObject::tr("View Recordings") + 4330 4538 QString(" (%1/%2)").arg(++i).arg(total)); … … 4352 4560 pbox3->addChild(DisplayGroupTitleSort()); 4353 4561 pbox3->addChild(new WatchListSettings()); 4354 4562 addChild(pbox3); 4563 } 4355 4564 4356 4565 VerticalConfigurationGroup* seek = new VerticalConfigurationGroup(false); 4357 4566 seek->setLabel(QObject::tr("Seeking") + 4358 4567 QString(" (%1/%2)").arg(++i).arg(total)); 4359 seek->addChild(SmartForward()); 4360 seek->addChild(FFRewReposTime()); 4361 seek->addChild(FFRewReverse()); 4362 seek->addChild(ExactSeeking()); 4363 addChild(seek); 4568 if (settings) 4569 seek->setLabel(QObject::tr("Playback group settings for ") + 4570 settings->mGroupName + " - " + 4571 seek->getLabel()); 4572 seek->addChild(SmartForward(settings)); 4573 seek->addChild(FFRewReposTime(settings)); 4574 seek->addChild(FFRewReverse(settings)); 4575 seek->addChild(ExactSeeking(settings)); 4576 if (base) 4577 base->addChild(seek); 4578 else 4579 addChild(seek); 4364 4580 4365 4581 VerticalConfigurationGroup* comms = new VerticalConfigurationGroup(false); 4366 4582 comms->setLabel(QObject::tr("Commercial Skip") + 4367 4583 QString(" (%1/%2)").arg(++i).arg(total)); 4368 comms->addChild(AutoCommercialSkip()); 4369 comms->addChild(CommRewindAmount()); 4370 comms->addChild(CommNotifyAmount()); 4584 if (settings) 4585 comms->setLabel(QObject::tr("Playback group settings for ") + 4586 settings->mGroupName + " - " + 4587 comms->getLabel()); 4588 comms->addChild(AutoCommercialSkip(settings)); 4589 comms->addChild(CommRewindAmount(settings)); 4590 comms->addChild(CommNotifyAmount(settings)); 4591 if (!settings) // these are global settings, not host-specific 4592 { 4371 4593 comms->addChild(MaximumCommercialSkip()); 4372 4594 comms->addChild(MergeShortCommBreaks()); 4373 4595 comms->addChild(CommSkipAllBlanks()); 4374 addChild(comms); 4596 } 4597 if (base) 4598 base->addChild(comms); 4599 else 4600 addChild(comms); 4375 4601 4376 4602 #if CONFIG_DARWIN 4377 4603 VerticalConfigurationGroup* mac1 = new VerticalConfigurationGroup(false); 4378 4604 mac1->setLabel(QObject::tr("Mac OS X video settings") + 4379 4605 QString(" (%1/%2)").arg(++i).arg(total)); 4606 if (settings) 4607 mac1->setLabel(QObject::tr("Playback group settings for ") + 4608 settings->mGroupName + " - " + 4609 mac1->getLabel()); 4610 if (!settings) 4611 { 4380 4612 mac1->addChild(MacGammaCorrect()); 4381 4613 mac1->addChild(MacScaleUp()); 4382 4614 mac1->addChild(MacFullSkip()); 4383 addChild(mac1); 4615 } 4616 if (base) 4617 base->addChild(mac1); 4618 else 4619 addChild(mac1); 4384 4620 4385 4621 VerticalConfigurationGroup* mac2 = new VerticalConfigurationGroup(false); 4386 4622 mac2->setLabel(QObject::tr("Mac OS X video settings") + 4387 4623 QString(" (%1/%2)").arg(++i).arg(total)); 4624 if (settings) 4625 mac2->setLabel(QObject::tr("Playback group settings for ") + 4626 settings->mGroupName + " - " + 4627 mac2->getLabel()); 4628 if (!setings) 4629 { 4388 4630 mac2->addChild(new MacMainSettings()); 4389 4631 mac2->addChild(new MacFloatSettings()); 4390 4632 … … 4393 4635 row->addChild(new MacDockSettings()); 4394 4636 row->addChild(new MacDesktopSettings()); 4395 4637 mac2->addChild(row); 4638 } 4396 4639 4397 addChild(mac2); 4640 if (base) 4641 base->addChild(mac2); 4642 else 4643 addChild(mac2); 4398 4644 #endif 4399 4645 } 4400 4646 4401 OSDSettings::OSDSettings() 4647 OSDSettings::OSDSettings(PlaySettings *settings, 4648 ConfigurationWizard *base) 4402 4649 { 4403 4650 VerticalConfigurationGroup* osd = new VerticalConfigurationGroup(false); 4404 4651 osd->setLabel(QObject::tr("On-screen display")); 4652 if (settings) 4653 osd->setLabel(QObject::tr("Playback group settings for ") + 4654 settings->mGroupName + " - " + 4655 osd->getLabel()); 4405 4656 4406 osd->addChild(new ThemeSelector("OSDTheme")); 4407 osd->addChild(OSDGeneralTimeout()); 4408 osd->addChild(OSDProgramInfoTimeout()); 4409 osd->addChild(OSDFont()); 4410 osd->addChild(OSDThemeFontSizeType()); 4411 osd->addChild(EnableMHEG()); 4412 osd->addChild(PersistentBrowseMode()); 4413 osd->addChild(BrowseAllTuners()); 4414 addChild(osd); 4657 osd->addChild(ThemeSelector("OSDTheme", settings)); 4658 osd->addChild(OSDGeneralTimeout(settings)); 4659 osd->addChild(OSDProgramInfoTimeout(settings)); 4660 osd->addChild(OSDFont(settings)); 4661 osd->addChild(OSDThemeFontSizeType(settings)); 4662 osd->addChild(EnableMHEG(settings)); 4663 if (!settings) 4664 { 4665 osd->addChild(PersistentBrowseMode(settings)); 4666 osd->addChild(BrowseAllTuners(settings)); 4667 } 4668 if (base) 4669 base->addChild(osd); 4670 else 4671 addChild(osd); 4415 4672 4416 4673 VerticalConfigurationGroup *udp = new VerticalConfigurationGroup(false); 4417 4674 udp->setLabel(QObject::tr("UDP OSD Notifications")); 4418 udp->addChild(OSDNotifyTimeout()); 4419 udp->addChild(UDPNotifyPort()); 4420 addChild(udp); 4675 if (settings) 4676 udp->setLabel(QObject::tr("Playback group settings for ") + 4677 settings->mGroupName + " - " + 4678 udp->getLabel()); 4679 udp->addChild(OSDNotifyTimeout(settings)); 4680 udp->addChild(UDPNotifyPort(settings)); 4681 if (base) 4682 base->addChild(udp); 4683 else 4684 addChild(udp); 4421 4685 4422 4686 VerticalConfigurationGroup *cc = new VerticalConfigurationGroup(false); 4423 4687 cc->setLabel(QObject::tr("Analog Closed Captions")); 4424 cc->addChild(OSDCCFont()); 4688 if (settings) 4689 cc->setLabel(QObject::tr("Playback group settings for ") + 4690 settings->mGroupName + " - " + 4691 cc->getLabel()); 4692 cc->addChild(OSDCCFont(settings)); 4425 4693 //cc->addChild(DecodeVBIFormat()); 4426 cc->addChild(CCBackground()); 4427 cc->addChild(DefaultCCMode()); 4428 cc->addChild(PreferCC708()); 4429 addChild(cc); 4694 cc->addChild(CCBackground(settings)); 4695 cc->addChild(DefaultCCMode(settings)); 4696 cc->addChild(PreferCC708(settings)); 4697 if (base) 4698 base->addChild(cc); 4699 else 4700 addChild(cc); 4430 4701 4431 addChild(OSDCC708Settings()); 4432 addChild(OSDCC708Fonts()); 4433 addChild(ExternalSubtitleSettings()); 4702 if (base) 4703 { 4704 base->addChild(OSDCC708Settings(settings)); 4705 base->addChild(OSDCC708Fonts(settings)); 4706 base->addChild(ExternalSubtitleSettings(settings)); 4707 } 4708 else 4709 { 4710 addChild(OSDCC708Settings(settings)); 4711 addChild(OSDCC708Fonts(settings)); 4712 addChild(ExternalSubtitleSettings(settings)); 4713 } 4434 4714 4435 4715 #if CONFIG_DARWIN 4436 4716 // Any Mac OS-specific OSD stuff would go here. … … 4582 4862 VerticalConfigurationGroup* theme = new VerticalConfigurationGroup(false); 4583 4863 theme->setLabel(QObject::tr("Theme")); 4584 4864 4585 theme->addChild( newThemeSelector("Theme"));4865 theme->addChild(ThemeSelector("Theme")); 4586 4866 4587 4867 theme->addChild(ThemeCacheSize()); 4588 4868 -
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" … … 487 488 delete statusbox; 488 489 } 489 490 491 ConfigurationWizard *createPlaybackSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base) 492 { 493 return new PlaybackSettings(settings, base); 494 } 495 496 ConfigurationWizard *createOSDSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base) 497 { 498 return new OSDSettings(settings, base); 499 } 500 501 ConfigurationWizard *createMainGeneralSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base) 502 { 503 return new MainGeneralSettings(settings, base); 504 } 505 506 static PlayGroupEditor::SettingsLookup pbgroupSetup[] = { 507 createPlaybackSettingsForPlaybackGroup, 508 createOSDSettingsForPlaybackGroup, 509 createMainGeneralSettingsForPlaybackGroup 510 }; 511 490 512 void TVMenuCallback(void *data, QString &selection) 491 513 { 492 514 (void)data; … … 579 601 } 580 602 else if (sel == "settings playgroup") 581 603 { 582 PlayGroupEditor editor; 604 PlayGroupEditor editor(pbgroupSetup, 605 sizeof(pbgroupSetup)/sizeof(*pbgroupSetup)); 583 606 editor.exec(); 584 607 } 585 608 else if (sel == "settings general") … … 771 794 } 772 795 } 773 796 delete tmprbuf; 797 pginfo->SetPlaybackGroup("Videos"); 774 798 } 775 799 else if (pginfo->IsVideo()) 800 { 776 801 pos = pginfo->QueryBookmark(); 802 pginfo->SetPlaybackGroup("Videos"); 803 } 777 804 778 805 if (pos > 0) 779 806 { -
programs/mythfrontend/globalsettings.h
10 10 #include "themeinfo.h" 11 11 12 12 class QFileInfo; 13 class PlaySettings; 13 14 14 15 class AudioOutputDevice : public HostComboBox 15 16 { … … 37 38 class PlaybackSettings : public ConfigurationWizard 38 39 { 39 40 public: 40 PlaybackSettings(); 41 PlaybackSettings(PlaySettings *settings=NULL, 42 ConfigurationWizard *base=NULL); 41 43 }; 42 44 43 45 class OSDSettings: virtual public ConfigurationWizard 44 46 { 45 47 public: 46 OSDSettings(); 48 OSDSettings(PlaySettings *settings=NULL, 49 ConfigurationWizard *base=NULL); 47 50 }; 48 51 49 52 class GeneralSettings : public ConfigurationWizard … … 67 70 class MainGeneralSettings : public ConfigurationWizard 68 71 { 69 72 public: 70 MainGeneralSettings(); 73 MainGeneralSettings(PlaySettings *settings=NULL, 74 ConfigurationWizard *base=NULL); 71 75 }; 72 76 73 77 class GeneralRecPrioritiesSettings : public ConfigurationWizard … … 155 159 Q_OBJECT 156 160 157 161 public: 158 PlaybackProfileConfigs(const QString &str );162 PlaybackProfileConfigs(const QString &str, PlaySettings *settings); 159 163 virtual ~PlaybackProfileConfigs(); 160 164 161 165 private: … … 167 171 168 172 private: 169 173 QStringList profiles; 170 HostComboBox*grouptrigger;174 ComboBoxSetting *grouptrigger; 171 175 }; 172 176 173 177 #endif -
programs/mythtranscode/transcode.cpp
36 36 class AudioReencodeBuffer : public AudioOutput 37 37 { 38 38 public: 39 AudioReencodeBuffer(int audio_bits, int audio_channels) 39 AudioReencodeBuffer(int audio_bits, int audio_channels, 40 PlaySettings *psettings) 41 : AudioOutput(psettings) 40 42 { 41 43 Reset(); 42 const AudioSettings settings(audio_bits, audio_channels, 0, 0, false); 44 const AudioSettings settings(audio_bits, audio_channels, 0, 0, false, 45 psettings); 43 46 Reconfigure(settings); 44 47 bufsize = 512000; 45 48 audiobuffer = new unsigned char[bufsize]; … … 419 422 statustime = statustime.addSecs(5); 420 423 } 421 424 422 AudioOutput *audioOutput = new AudioReencodeBuffer(0, 0); 425 AudioOutput *audioOutput = 426 new AudioReencodeBuffer(0, 0, player_ctx->settings); 423 427 AudioReencodeBuffer *arb = ((AudioReencodeBuffer*)audioOutput); 424 428 nvp->SetAudioOutput(audioOutput); 425 429 nvp->SetTranscoding(true); -
programs/mythavtest/main.cpp
22 22 #include "dbcheck.h" 23 23 #include "myththemebase.h" 24 24 #include "audiopulseutil.h" 25 #include "playsettings.h" 25 26 26 27 27 28 static void *run_priv_thread(void *data) … … 188 189 if (pa_ret != GENERIC_EXIT_OK) 189 190 return pa_ret; 190 191 191 #if defined(Q_OS_MACX)192 // Mac OS X doesn't define the AudioOutputDevice setting193 #else194 QString auddevice = gCoreContext->GetSetting("AudioOutputDevice");195 if (auddevice.isEmpty())196 {197 VERBOSE(VB_IMPORTANT, "Fatal Error: Audio not configured, you need "198 "to run 'mythfrontend', not 'mythtv'.");199 return TV_EXIT_NO_AUDIO;200 }201 #endif202 203 192 MythMainWindow *mainWindow = GetMythMainWindow(); 204 193 mainWindow->Init(); 205 194 MythThemeBase *theme = new MythThemeBase(); … … 213 202 return GENERIC_EXIT_DB_OUTOFDATE; 214 203 } 215 204 216 TV *tv = new TV(); 205 QString playgroup(""); 206 if (!filename.isEmpty()) 207 { 208 ProgramInfo pg(filename); 209 playgroup = pg.GetPlaybackGroup(); 210 } 211 PlaySettings settings(playgroup); 212 213 #if defined(Q_OS_MACX) 214 // Mac OS X doesn't define the AudioOutputDevice setting 215 #else 216 QString auddevice = settings.GetSetting("AudioOutputDevice", ""); 217 if (auddevice.isEmpty()) 218 { 219 VERBOSE(VB_IMPORTANT, "Fatal Error: Audio not configured, you need " 220 "to run 'mythfrontend', not 'mythtv'."); 221 return TV_EXIT_NO_AUDIO; 222 } 223 #endif 224 225 TV *tv = new TV(&settings); 217 226 if (!tv->Init()) 218 227 { 219 228 VERBOSE(VB_IMPORTANT, "Fatal Error: Could not initialize TV class.");