[mythtv-commits] mythtv commit: r24623 - in trunk/mythtv by cpinkham

mythtv at cvs.mythtv.org mythtv at cvs.mythtv.org
Thu May 13 04:12:30 UTC 2010


      Author: cpinkham
        Date: 2010-05-13 04:12:30 +0000 (Thu, 13 May 2010)
New Revision: 24623
   Changeset: http://svn.mythtv.org/trac/changeset/24623

Added:

   trunk/mythtv/libs/libmythdb/mythcorecontext.cpp
   trunk/mythtv/libs/libmythdb/mythcorecontext.h
   trunk/mythtv/libs/libmythdb/mythsystem.cpp
   trunk/mythtv/libs/libmythdb/mythsystem.h

Removed:

   trunk/mythtv/libs/libmythui/mythsystem.cpp
   trunk/mythtv/libs/libmythui/mythsystem.h

Modified:

   trunk/mythtv/libs/libmyth/audiooutputalsa.cpp
   trunk/mythtv/libs/libmyth/audiooutputbase.cpp
   trunk/mythtv/libs/libmyth/audiooutputca.cpp
   trunk/mythtv/libs/libmyth/audiooutputdx.cpp
   trunk/mythtv/libs/libmyth/audiooutputjack.cpp
   trunk/mythtv/libs/libmyth/audiooutputnull.cpp
   trunk/mythtv/libs/libmyth/audiooutputoss.cpp
   trunk/mythtv/libs/libmyth/audiooutputpulse.cpp
   trunk/mythtv/libs/libmyth/audiooutputwin.cpp
   trunk/mythtv/libs/libmyth/audiopulseutil.cpp
   trunk/mythtv/libs/libmyth/dbutil.cpp
   trunk/mythtv/libs/libmyth/dialogbox.cpp
   trunk/mythtv/libs/libmyth/langsettings.cpp
   trunk/mythtv/libs/libmyth/mediamonitor-unix.cpp
   trunk/mythtv/libs/libmyth/mediamonitor-windows.cpp
   trunk/mythtv/libs/libmyth/mythcdrom-freebsd.cpp
   trunk/mythtv/libs/libmyth/mythcdrom-linux.cpp
   trunk/mythtv/libs/libmyth/mythconfigdialogs.cpp
   trunk/mythtv/libs/libmyth/mythcontext.cpp
   trunk/mythtv/libs/libmyth/mythcontext.h
   trunk/mythtv/libs/libmyth/mythdialogs.cpp
   trunk/mythtv/libs/libmyth/mythmediamonitor.cpp
   trunk/mythtv/libs/libmyth/mythplugin.cpp
   trunk/mythtv/libs/libmyth/mythterminal.cpp
   trunk/mythtv/libs/libmyth/mythuifilebrowser.cpp
   trunk/mythtv/libs/libmyth/mythwidgets.cpp
   trunk/mythtv/libs/libmyth/mythwizard.cpp
   trunk/mythtv/libs/libmyth/programinfo.cpp
   trunk/mythtv/libs/libmyth/programlist.cpp
   trunk/mythtv/libs/libmyth/rawsettingseditor.cpp
   trunk/mythtv/libs/libmyth/remoteutil.cpp
   trunk/mythtv/libs/libmyth/schemawizard.cpp
   trunk/mythtv/libs/libmyth/settings.cpp
   trunk/mythtv/libs/libmyth/storagegroup.cpp
   trunk/mythtv/libs/libmyth/uilistbtntype.cpp
   trunk/mythtv/libs/libmyth/uitypes.cpp
   trunk/mythtv/libs/libmyth/util.cpp
   trunk/mythtv/libs/libmyth/util.h
   trunk/mythtv/libs/libmyth/virtualkeyboard_qt.cpp
   trunk/mythtv/libs/libmyth/volumebase.cpp
   trunk/mythtv/libs/libmyth/xmlparse.cpp
   trunk/mythtv/libs/libmythdb/libmythdb.pro
   trunk/mythtv/libs/libmythdb/mythevent.cpp
   trunk/mythtv/libs/libmythdb/mythevent.h
   trunk/mythtv/libs/libmythdb/mythversion.h
   trunk/mythtv/libs/libmythdb/remotefile.cpp
   trunk/mythtv/libs/libmythdb/remotefile.h
   trunk/mythtv/libs/libmythtv/BDRingBuffer.cpp
   trunk/mythtv/libs/libmythtv/DVDRingBuffer.cpp
   trunk/mythtv/libs/libmythtv/DetectLetterbox.cpp
   trunk/mythtv/libs/libmythtv/DeviceReadBuffer.cpp
   trunk/mythtv/libs/libmythtv/NuppelVideoPlayer.cpp
   trunk/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
   trunk/mythtv/libs/libmythtv/ThreadedFileWriter.cpp
   trunk/mythtv/libs/libmythtv/analogsignalmonitor.cpp
   trunk/mythtv/libs/libmythtv/audioinput.cpp
   trunk/mythtv/libs/libmythtv/audioinputalsa.cpp
   trunk/mythtv/libs/libmythtv/audioinputoss.cpp
   trunk/mythtv/libs/libmythtv/avformatdecoder.cpp
   trunk/mythtv/libs/libmythtv/cardutil.cpp
   trunk/mythtv/libs/libmythtv/cc708decoder.cpp
   trunk/mythtv/libs/libmythtv/channelbase.cpp
   trunk/mythtv/libs/libmythtv/channelgroup.cpp
   trunk/mythtv/libs/libmythtv/channelgroupsettings.cpp
   trunk/mythtv/libs/libmythtv/channelscan/channelimporter.cpp
   trunk/mythtv/libs/libmythtv/channelscan/channelscanner_gui.cpp
   trunk/mythtv/libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp
   trunk/mythtv/libs/libmythtv/channelscan/inputselectorsetting.cpp
   trunk/mythtv/libs/libmythtv/channelscan/scaninfo.cpp
   trunk/mythtv/libs/libmythtv/datadirect.cpp
   trunk/mythtv/libs/libmythtv/dbchannelinfo.cpp
   trunk/mythtv/libs/libmythtv/dbcheck.cpp
   trunk/mythtv/libs/libmythtv/decoderbase.cpp
   trunk/mythtv/libs/libmythtv/diseqc.cpp
   trunk/mythtv/libs/libmythtv/diseqcsettings.cpp
   trunk/mythtv/libs/libmythtv/dvbdev/dvbci.cpp
   trunk/mythtv/libs/libmythtv/dvbrecorder.cpp
   trunk/mythtv/libs/libmythtv/eitfixup.cpp
   trunk/mythtv/libs/libmythtv/eithelper.cpp
   trunk/mythtv/libs/libmythtv/filtermanager.cpp
   trunk/mythtv/libs/libmythtv/firewiredevice.cpp
   trunk/mythtv/libs/libmythtv/firewirerecorder.cpp
   trunk/mythtv/libs/libmythtv/firewiresignalmonitor.cpp
   trunk/mythtv/libs/libmythtv/hdhrchannel.cpp
   trunk/mythtv/libs/libmythtv/hdhrrecorder.cpp
   trunk/mythtv/libs/libmythtv/hdhrsignalmonitor.cpp
   trunk/mythtv/libs/libmythtv/hdhrstreamhandler.cpp
   trunk/mythtv/libs/libmythtv/importrecorder.cpp
   trunk/mythtv/libs/libmythtv/iso639.cpp
   trunk/mythtv/libs/libmythtv/jobqueue.cpp
   trunk/mythtv/libs/libmythtv/linuxavcinfo.cpp
   trunk/mythtv/libs/libmythtv/linuxfirewiredevice.cpp
   trunk/mythtv/libs/libmythtv/livetvchain.cpp
   trunk/mythtv/libs/libmythtv/mhi.cpp
   trunk/mythtv/libs/libmythtv/mpeg/atscdescriptors.cpp
   trunk/mythtv/libs/libmythtv/mpegrecorder.cpp
   trunk/mythtv/libs/libmythtv/mythsystemevent.cpp
   trunk/mythtv/libs/libmythtv/nuppeldecoder.cpp
   trunk/mythtv/libs/libmythtv/osd.cpp
   trunk/mythtv/libs/libmythtv/osdchromakey.cpp
   trunk/mythtv/libs/libmythtv/osdlistbtntype.cpp
   trunk/mythtv/libs/libmythtv/osdsurface.cpp
   trunk/mythtv/libs/libmythtv/osdtypes.cpp
   trunk/mythtv/libs/libmythtv/playercontext.cpp
   trunk/mythtv/libs/libmythtv/playgroup.cpp
   trunk/mythtv/libs/libmythtv/previewgenerator.cpp
   trunk/mythtv/libs/libmythtv/profilegroup.cpp
   trunk/mythtv/libs/libmythtv/recordinginfo.cpp
   trunk/mythtv/libs/libmythtv/recordinglist.cpp
   trunk/mythtv/libs/libmythtv/recordingprofile.cpp
   trunk/mythtv/libs/libmythtv/recordingrule.cpp
   trunk/mythtv/libs/libmythtv/remoteencoder.cpp
   trunk/mythtv/libs/libmythtv/scanwizard.cpp
   trunk/mythtv/libs/libmythtv/scheduledrecording.cpp
   trunk/mythtv/libs/libmythtv/signalmonitor.cpp
   trunk/mythtv/libs/libmythtv/textsubtitleparser.cpp
   trunk/mythtv/libs/libmythtv/transporteditor.cpp
   trunk/mythtv/libs/libmythtv/tv_play.cpp
   trunk/mythtv/libs/libmythtv/tv_rec.cpp
   trunk/mythtv/libs/libmythtv/tvosdmenuentry.cpp
   trunk/mythtv/libs/libmythtv/tvremoteutil.cpp
   trunk/mythtv/libs/libmythtv/udpnotify.cpp
   trunk/mythtv/libs/libmythtv/v4lchannel.cpp
   trunk/mythtv/libs/libmythtv/videodisplayprofile.cpp
   trunk/mythtv/libs/libmythtv/videoout_d3d.cpp
   trunk/mythtv/libs/libmythtv/videoout_directfb.cpp
   trunk/mythtv/libs/libmythtv/videoout_opengl.cpp
   trunk/mythtv/libs/libmythtv/videoout_quartz.cpp
   trunk/mythtv/libs/libmythtv/videoout_vdpau.cpp
   trunk/mythtv/libs/libmythtv/videoout_xv.cpp
   trunk/mythtv/libs/libmythtv/videooutbase.cpp
   trunk/mythtv/libs/libmythtv/videooutwindow.cpp
   trunk/mythtv/libs/libmythtv/videosource.cpp
   trunk/mythtv/libs/libmythtv/vsync.cpp
   trunk/mythtv/libs/libmythui/libmythui.pro
   trunk/mythtv/libs/libmythui/mythmainwindow.cpp
   trunk/mythtv/libs/libmythui/mythmainwindow.h
   trunk/mythtv/programs/mythavtest/main.cpp
   trunk/mythtv/programs/mythbackend/autoexpire.cpp
   trunk/mythtv/programs/mythbackend/encoderlink.cpp
   trunk/mythtv/programs/mythbackend/housekeeper.cpp
   trunk/mythtv/programs/mythbackend/httpstatus.cpp
   trunk/mythtv/programs/mythbackend/main.cpp
   trunk/mythtv/programs/mythbackend/main_helpers.cpp
   trunk/mythtv/programs/mythbackend/mainserver.cpp
   trunk/mythtv/programs/mythbackend/mediaserver.cpp
   trunk/mythtv/programs/mythbackend/mythxml.cpp
   trunk/mythtv/programs/mythbackend/playbacksock.cpp
   trunk/mythtv/programs/mythbackend/scheduler.cpp
   trunk/mythtv/programs/mythbackend/upnpcdsmusic.cpp
   trunk/mythtv/programs/mythbackend/upnpcdstv.cpp
   trunk/mythtv/programs/mythbackend/upnpcdsvideo.cpp
   trunk/mythtv/programs/mythbackend/upnpmedia.cpp
   trunk/mythtv/programs/mythcommflag/BlankFrameDetector.cpp
   trunk/mythtv/programs/mythcommflag/BorderDetector.cpp
   trunk/mythtv/programs/mythcommflag/CannyEdgeDetector.cpp
   trunk/mythtv/programs/mythcommflag/ClassicCommDetector.cpp
   trunk/mythtv/programs/mythcommflag/ClassicLogoDetector.cpp
   trunk/mythtv/programs/mythcommflag/CustomEventRelayer.h
   trunk/mythtv/programs/mythcommflag/FrameAnalyzer.cpp
   trunk/mythtv/programs/mythcommflag/HistogramAnalyzer.cpp
   trunk/mythtv/programs/mythcommflag/PGMConverter.cpp
   trunk/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp
   trunk/mythtv/programs/mythcommflag/SceneChangeDetector.cpp
   trunk/mythtv/programs/mythcommflag/TemplateFinder.cpp
   trunk/mythtv/programs/mythcommflag/TemplateMatcher.cpp
   trunk/mythtv/programs/mythcommflag/main.cpp
   trunk/mythtv/programs/mythcommflag/pgm.cpp
   trunk/mythtv/programs/mythfilldatabase/filldata.cpp
   trunk/mythtv/programs/mythfilldatabase/fillutil.cpp
   trunk/mythtv/programs/mythfilldatabase/icondata.cpp
   trunk/mythtv/programs/mythfilldatabase/main.cpp
   trunk/mythtv/programs/mythfilldatabase/xmltvparser.cpp
   trunk/mythtv/programs/mythfrontend/actionset.cpp
   trunk/mythtv/programs/mythfrontend/backendconnectionmanager.cpp
   trunk/mythtv/programs/mythfrontend/channelrecpriority.cpp
   trunk/mythtv/programs/mythfrontend/customedit.cpp
   trunk/mythtv/programs/mythfrontend/custompriority.cpp
   trunk/mythtv/programs/mythfrontend/exitprompt.cpp
   trunk/mythtv/programs/mythfrontend/globalsettings.cpp
   trunk/mythtv/programs/mythfrontend/guidegrid.cpp
   trunk/mythtv/programs/mythfrontend/keybindings.cpp
   trunk/mythtv/programs/mythfrontend/keygrabber.cpp
   trunk/mythtv/programs/mythfrontend/main.cpp
   trunk/mythtv/programs/mythfrontend/manualschedule.cpp
   trunk/mythtv/programs/mythfrontend/mythappearance.cpp
   trunk/mythtv/programs/mythfrontend/mythcontrols.cpp
   trunk/mythtv/programs/mythfrontend/mythfexml.cpp
   trunk/mythtv/programs/mythfrontend/mythosdmenueditor.cpp
   trunk/mythtv/programs/mythfrontend/networkcontrol.cpp
   trunk/mythtv/programs/mythfrontend/playbackbox.cpp
   trunk/mythtv/programs/mythfrontend/playbackboxhelper.cpp
   trunk/mythtv/programs/mythfrontend/progdetails.cpp
   trunk/mythtv/programs/mythfrontend/progfind.cpp
   trunk/mythtv/programs/mythfrontend/proglist.cpp
   trunk/mythtv/programs/mythfrontend/programrecpriority.cpp
   trunk/mythtv/programs/mythfrontend/schedulecommon.cpp
   trunk/mythtv/programs/mythfrontend/scheduleeditor.cpp
   trunk/mythtv/programs/mythfrontend/statusbox.cpp
   trunk/mythtv/programs/mythfrontend/viewscheduled.cpp
   trunk/mythtv/programs/mythfrontend/viewschedulediff.cpp
   trunk/mythtv/programs/mythjobqueue/main.cpp
   trunk/mythtv/programs/mythlcdserver/lcdprocclient.cpp
   trunk/mythtv/programs/mythlcdserver/main.cpp
   trunk/mythtv/programs/mythshutdown/main.cpp
   trunk/mythtv/programs/mythtranscode/main.cpp
   trunk/mythtv/programs/mythtranscode/transcode.cpp
   trunk/mythtv/programs/mythtv-setup/backendsettings.cpp
   trunk/mythtv/programs/mythtv-setup/channeleditor.cpp
   trunk/mythtv/programs/mythtv-setup/checksetup.cpp
   trunk/mythtv/programs/mythtv-setup/exitprompt.cpp
   trunk/mythtv/programs/mythtv-setup/expertsettingseditor.h
   trunk/mythtv/programs/mythtv-setup/importicons.cpp
   trunk/mythtv/programs/mythtv-setup/main.cpp
   trunk/mythtv/programs/mythtv-setup/startprompt.cpp
   trunk/mythtv/programs/mythwelcome/main.cpp
   trunk/mythtv/programs/mythwelcome/welcomedialog.cpp
   trunk/mythtv/programs/mythwelcome/welcomesettings.cpp

Log:

Short answer:

If your patch breaks, ESC : %s/gContext/gCoreContext/g ENTER in 99% of cases.
If that doesn't fix it, it might be s/gContext->GetMainWindow/GetMythMainWindow/g
And make clean since the API version changed.

Long answer:

This commit is a MythContext reorganization patch.  The main goal is to get
the non-GUI portions of MythContext deeper into the library dependency
tree.  libmyth depends on libmythui which depends on libmythdb.  This means
that neither libmythdb or libmythui can use anything in the current
MythContext.  This patch addresses this issue by moving most of MythContext
into libmythdb as MythCoreContext.  This will for instance allow libmythdb
and libmythui code to use the existing master backend connection rather than
having to open a new connection to talk to the master.

To accomplish the above, this patch...

- moves the non-GUI portions of MythContext to a new MythCoreContext class
  located in libs/libmythdb/mythcorecontext.(cpp|h).  Also changes
  #include mythcontext.h to #include mythcorecontext.h where applicable.

- adds a new gCoreContext global pointer to the MythCoreContext instance.
  gCoreContext is now used in most places that gContext was used previously
  since most of these methods are now in MythCoreContext.  The global
  gCoreContext creation/deletion is handled by the global MythContext.
  MythContext does not inherit from MythCoreContext because we need the
  routines in MythCoreContext to be accessible via the gCoreContext pointer
  inside libmythdb and libmythui.

- moves mythsystem.(cpp|h) from libmythui to libmythdb

- moves the following methods out of MythContext:

  MythContext::sendPlaybackStart() -> sendPlaybackStart() in libmyth/util.cpp
  MythContext::sendPlaybackEnd()   -> sendPlaybackEnd() in libmyth/util.cpp

- gets rid of the following methods:

  MythContext::GetMainWindow()     (use mythmainwindow.h's GetMythMainWindow())
  MythContext::SetMainWindow()     (not needed without ::GetMainWindow())
  MythContext::TranslateKeyPress() (already commented as deprecated,
                                    use GetMythMainWindow()->TranslateKeyPress())

- creates the following method(s):

  MythContext::SetDisableEventPopup(bool) (used by frontend's exit prompt
                                           code to disable popups since
                                           MythContext::SetMainWindow() does
                                           not exist anymore)

- performs some minor header cleanup, converting some files from #including
  mythcontext.h to instead include mythverbose.h since all they needed was
  access to the VERBOSE macro.


You'll need to do a make clean on this one.  The binary API is updated and
libmythdb, libmythui, and libmyth are all changed more than a tiny bit.
Most of the rest of the changes are s/gContext/gCoreContext/g with a little
s/mythcontext.h/mythcorecontext.h/ thrown in for #include changes.

=============================================================================






More information about the mythtv-commits mailing list