[mythtv-commits] mythtv branch master updated by jstichnoth. v0.27-pre2-1042-g38608a4

Git Repo Owner noreply at mythtv.org
Mon May 13 06:07:57 UTC 2013


The branch, master has been updated on the
mythtv repository by gitolite user jstichnoth.
       via  38608a4b587235e3dd907c7b2b5c1a0de6815ba6 (commit)
       via  892cd6426e98ee25b0d8afb68d55b7b0b4fb3bbe (commit)
       via  46d96bfc12654b89e4f7df63a9747fc9709322e2 (commit)
       via  9bb9c61166188ae0222b22ae0091b1e63ffa196c (commit)
      from  9c728cb8f19100e9976196709b8258480e72d30b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 38608a4b587235e3dd907c7b2b5c1a0de6815ba6
Author:    Jim Stichnoth <jstichnoth at mythtv.org> at Sun, 12 May 2013 22:58:12 -0700
Committer: Jim Stichnoth <jstichnoth at mythtv.org> at Sun, 12 May 2013 22:59:49 -0700
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=38608a4b587235e3dd907c7b2b5c1a0de6815ba6

Make substring comparisons less fragile.  Fixes #11536.



commit 892cd6426e98ee25b0d8afb68d55b7b0b4fb3bbe
Author:    Jim Stichnoth <jstichnoth at mythtv.org> at Sat, 11 May 2013 07:03:43 -0700
Committer: Jim Stichnoth <jstichnoth at mythtv.org> at Sun, 12 May 2013 22:59:49 -0700
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=892cd6426e98ee25b0d8afb68d55b7b0b4fb3bbe

Themed menus: Prepend GetConfDir() to the search path.
This means $MYTHCONFDIR or ~/.mythtv is searched first.  Refs #11533.



commit 46d96bfc12654b89e4f7df63a9747fc9709322e2
Author:    Jim Stichnoth <jstichnoth at mythtv.org> at Fri, 10 May 2013 13:31:36 -0700
Committer: Jim Stichnoth <jstichnoth at mythtv.org> at Sun, 12 May 2013 22:59:49 -0700
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=46d96bfc12654b89e4f7df63a9747fc9709322e2

Themed Menus part 2: remove old code.  Refs #11533



commit 9bb9c61166188ae0222b22ae0091b1e63ffa196c
Author:    Jim Stichnoth <jstichnoth at mythtv.org> at Fri, 10 May 2013 13:26:24 -0700
Committer: Jim Stichnoth <jstichnoth at mythtv.org> at Sun, 12 May 2013 22:59:49 -0700
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=9bb9c61166188ae0222b22ae0091b1e63ffa196c

Initial implementation of Themed Menus.  Refs #11533
Themed Menus allows customization of menus through a hierarchical xml
description, consisting of actions, action groups, and submenus. An
action group is essentially a macro that expands into a possibly
context-dependent list of actions.

This is demonstrated by replacing the deeply complex and hierarchical
Playback OSD menu with a themed menu equivalent, defined in
menu_playback.xml in the themes/default/ directory.

In addition, a "compact" version of the Playback OSD menu is added,
with the MENUCOMPACT action and an associated keybinding to display it
(defaults to Alt+M).  The default compact menu contains just a single
entry that invokes the regular Playback OSD menu (for now, I don't
want to impose my personal preferences about the most commonly used
actions).  As such, the compact menu is useful even for remote
controls without extra buttons to spare -- simply remap the MENU
button to the MENUCOMPACT action in the "TV Playback" context.

When more menus are converted to themed versions, the MenuBase class
should be moved out of tv_play.cpp and tv_play.h into a new file.

Note: This commit is broken into two parts: addition of new code, and
deletion of old code.  This is to make the diffs vastly more readable.



-----------------------------------------------------------------------

Summary of changes:
 mythtv/libs/libmyth/programinfo.cpp                |   14 +-
 mythtv/libs/libmyth/programinfo.h                  |    4 +-
 mythtv/libs/libmyth/schemawizard.cpp               |    6 +-
 mythtv/libs/libmyth/settings.h                     |    4 +-
 mythtv/libs/libmyth/storagegroupeditor.cpp         |    8 +-
 mythtv/libs/libmythbase/logging.cpp                |    2 +-
 mythtv/libs/libmythbase/mythmiscutil.cpp           |    2 +-
 mythtv/libs/libmythbase/plist.cpp                  |    2 +-
 mythtv/libs/libmythbase/remotefile.cpp             |   16 +-
 mythtv/libs/libmythbase/storagegroup.cpp           |    2 +-
 .../requesthandler/fileserverhandler.cpp           |    6 +-
 .../requesthandler/fileserverutil.cpp              |    2 +-
 mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp        |    6 +-
 mythtv/libs/libmythtv/cc608decoder.cpp             |   10 +-
 .../libs/libmythtv/channelscan/channelscanner.cpp  |    2 +-
 .../libmythtv/channelscan/iptvchannelfetcher.cpp   |    2 +-
 mythtv/libs/libmythtv/decoderbase.cpp              |   18 +-
 mythtv/libs/libmythtv/fileringbuffer.cpp           |    4 +-
 mythtv/libs/libmythtv/jobqueue.cpp                 |    2 +-
 mythtv/libs/libmythtv/mythplayer.cpp               |    2 +-
 mythtv/libs/libmythtv/playercontext.cpp            |    2 +-
 mythtv/libs/libmythtv/previewgenerator.cpp         |    4 +-
 mythtv/libs/libmythtv/previewgeneratorqueue.cpp    |    2 +-
 mythtv/libs/libmythtv/recorders/channelbase.cpp    |    2 +-
 mythtv/libs/libmythtv/recorders/firewiredevice.cpp |   12 +-
 mythtv/libs/libmythtv/recorders/mpegrecorder.cpp   |   22 +-
 mythtv/libs/libmythtv/recorders/v4lchannel.cpp     |    6 +-
 mythtv/libs/libmythtv/recordingprofile.cpp         |   10 +-
 mythtv/libs/libmythtv/ringbuffer.cpp               |    4 +-
 mythtv/libs/libmythtv/sourceutil.cpp               |    4 +-
 mythtv/libs/libmythtv/transporteditor.cpp          |    4 +-
 mythtv/libs/libmythtv/tv_actions.h                 |    1 +
 mythtv/libs/libmythtv/tv_play.cpp                  | 2023 ++++++++++----------
 mythtv/libs/libmythtv/tv_play.h                    |  215 ++-
 mythtv/libs/libmythtv/videoout_xv.cpp              |    2 +-
 mythtv/libs/libmythtv/videooutbase.cpp             |    2 +-
 mythtv/libs/libmythtv/videosource.cpp              |   47 +-
 mythtv/libs/libmythui/mythmainwindow.cpp           |   14 +
 mythtv/libs/libmythui/mythmainwindow.h             |    1 +
 mythtv/libs/libmythui/myththemedmenu.cpp           |   20 +-
 mythtv/libs/libmythui/mythuiwebbrowser.cpp         |    2 +-
 mythtv/libs/libmythupnp/upnpdevice.cpp             |    2 +-
 mythtv/programs/mythbackend/autoexpire.cpp         |    2 +-
 mythtv/programs/mythbackend/backendutil.cpp        |    2 +-
 mythtv/programs/mythbackend/httpconfig.cpp         |    3 +-
 mythtv/programs/mythbackend/mainserver.cpp         |   36 +-
 mythtv/programs/mythbackend/services/content.cpp   |    2 +-
 mythtv/programs/mythcommflag/CommDetector2.cpp     |    2 +-
 mythtv/programs/mythfilldatabase/xmltvparser.cpp   |    2 +-
 mythtv/programs/mythfrontend/globalsettings.cpp    |    4 +-
 mythtv/programs/mythfrontend/idlescreen.cpp        |    4 +-
 mythtv/programs/mythfrontend/main.cpp              |    6 +-
 mythtv/programs/mythfrontend/networkcontrol.cpp    |    4 +-
 mythtv/programs/mythfrontend/playbackbox.cpp       |    6 +-
 mythtv/programs/mythfrontend/progfind.cpp          |   42 +-
 mythtv/programs/mythfrontend/upnpscanner.cpp       |    6 +-
 mythtv/programs/mythfrontend/videolist.cpp         |    2 +-
 mythtv/programs/mythlcdserver/lcdprocclient.cpp    |    2 +-
 mythtv/programs/mythtranscode/main.cpp             |    2 +-
 mythtv/programs/mythtranscode/transcode.cpp        |    2 +-
 mythtv/programs/mythwelcome/welcomedialog.cpp      |    8 +-
 mythtv/themes/default/menu_playback.xml            |  243 +++
 mythtv/themes/default/menu_playback_compact.xml    |   10 +
 63 files changed, 1705 insertions(+), 1200 deletions(-)
 create mode 100644 mythtv/themes/default/menu_playback.xml
 create mode 100644 mythtv/themes/default/menu_playback_compact.xml

-- 



More information about the mythtv-commits mailing list