Permalink
Browse files

Merge remote branch 'origin/master' into devel/rtp

Conflicts:
	mythtv/libs/libmythtv/libmythtv.pro
  • Loading branch information...
2 parents 5fba799 + acc4cd4 commit b43eb75045a4f2dcd327fe52ea26d7d82fb74fb6 @daniel-kristjansson daniel-kristjansson committed May 18, 2012
Showing with 5,313 additions and 2,739 deletions.
  1. +3 −3 mythplugins/mytharchive/i18n/mytharchive_es_es.ts
  2. +51 −51 mythplugins/mythmusic/i18n/mythmusic_es_es.ts
  3. +5 −0 mythplugins/mythmusic/mythmusic/avfdecoder.cpp
  4. +16 −6 mythplugins/mythmusic/mythmusic/main.cpp
  5. +1 −1 mythplugins/mythmusic/mythmusic/metadata.cpp
  6. +45 −17 mythplugins/mythmusic/mythmusic/musiccommon.cpp
  7. +1 −1 mythplugins/mythmusic/mythmusic/musiccommon.h
  8. +87 −23 mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
  9. +7 −0 mythplugins/mythmusic/theme/default-wide/music-base.xml
  10. BIN mythplugins/mythmusic/theme/default/images/mm_directory.png
  11. +7 −0 mythplugins/mythmusic/theme/default/music-base.xml
  12. +28 −28 mythplugins/mythnetvision/i18n/mythnetvision_es_es.ts
  13. +3 −0 mythtv/configure
  14. BIN mythtv/i18n/mythfrontend_es_es.qm
  15. +2,003 −2,016 mythtv/i18n/mythfrontend_es_es.ts
  16. +1 −1 mythtv/libs/libmythbase/mythcommandlineparser.cpp
  17. +1 −1 mythtv/libs/libmythbase/mythcorecontext.cpp
  18. +1 −1 mythtv/libs/libmythbase/mythsocket.cpp
  19. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythairplayserver.cpp
  20. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythairplayserver.h
  21. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythraopconnection.cpp
  22. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythraopconnection.h
  23. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythraopdevice.cpp
  24. 0 mythtv/libs/libmythtv/{ → AirPlay}/mythraopdevice.h
  25. 0 mythtv/libs/libmythtv/{ → Bluray}/avformatdecoderbd.cpp
  26. 0 mythtv/libs/libmythtv/{ → Bluray}/avformatdecoderbd.h
  27. 0 mythtv/libs/libmythtv/{ → Bluray}/bdoverlayscreen.cpp
  28. 0 mythtv/libs/libmythtv/{ → Bluray}/bdoverlayscreen.h
  29. 0 mythtv/libs/libmythtv/{ → Bluray}/bdringbuffer.cpp
  30. 0 mythtv/libs/libmythtv/{ → Bluray}/bdringbuffer.h
  31. 0 mythtv/libs/libmythtv/{ → Bluray}/mythbdplayer.cpp
  32. 0 mythtv/libs/libmythtv/{ → Bluray}/mythbdplayer.h
  33. 0 mythtv/libs/libmythtv/{ → DVD}/avformatdecoderdvd.cpp
  34. 0 mythtv/libs/libmythtv/{ → DVD}/avformatdecoderdvd.h
  35. 0 mythtv/libs/libmythtv/{ → DVD}/dvdringbuffer.cpp
  36. 0 mythtv/libs/libmythtv/{ → DVD}/dvdringbuffer.h
  37. 0 mythtv/libs/libmythtv/{ → DVD}/mythdvdplayer.cpp
  38. 0 mythtv/libs/libmythtv/{ → DVD}/mythdvdplayer.h
  39. +20 −19 mythtv/libs/libmythtv/{ → HLS}/httplivestream.cpp
  40. 0 mythtv/libs/libmythtv/{ → HLS}/httplivestream.h
  41. +2,591 −0 mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp
  42. +116 −0 mythtv/libs/libmythtv/HLS/httplivestreambuffer.h
  43. +2 −2 mythtv/libs/libmythtv/avformatdecoder.cpp
  44. +66 −42 mythtv/libs/libmythtv/avformatwriter.cpp
  45. +9 −0 mythtv/libs/libmythtv/dbcheck.cpp
  46. +2 −2 mythtv/libs/libmythtv/decoderbase.cpp
  47. +82 −56 mythtv/libs/libmythtv/libmythtv.pro
  48. +2 −2 mythtv/libs/libmythtv/osd.cpp
  49. +2 −1 mythtv/libs/libmythtv/osd.h
  50. +2 −2 mythtv/libs/libmythtv/playercontext.cpp
  51. +7 −3 mythtv/libs/libmythtv/recordingrule.cpp
  52. +10 −4 mythtv/libs/libmythtv/ringbuffer.cpp
  53. +1 −0 mythtv/libs/libmythtv/ringbuffer.h
  54. +8 −5 mythtv/libs/libmythtv/subtitlescreen.cpp
  55. +1 −0 mythtv/libs/libmythtv/subtitlescreen.h
  56. +1 −0 mythtv/libs/libmythtv/tv_actions.h
  57. +67 −5 mythtv/libs/libmythtv/tv_play.cpp
  58. +7 −1 mythtv/libs/libmythtv/tv_play.h
  59. +0 −3 mythtv/libs/libmythtv/videodbcheck.cpp
  60. +2 −1 mythtv/libs/libmythui/mythmainwindow.cpp
  61. +1 −1 mythtv/programs/mythbackend/services/content.cpp
  62. +14 −13 mythtv/programs/mythfilldatabase/xmltvparser.cpp
  63. +0 −11 mythtv/programs/mythfrontend/globalsettings.cpp
  64. +6 −3 mythtv/programs/mythfrontend/main.cpp
  65. +8 −20 mythtv/programs/mythfrontend/scheduleeditor.cpp
  66. +4 −3 mythtv/programs/mythshutdown/commandlineparser.cpp
  67. +3 −2 mythtv/programs/mythtranscode/transcode.cpp
  68. +6 −6 mythtv/programs/scripts/database/mythconverg_backup.pl
  69. +6 −6 mythtv/programs/scripts/database/mythconverg_restore.pl
  70. +0 −146 mythtv/themes/MythCenter-wide/base.xml
  71. +0 −14 mythtv/themes/MythCenter-wide/keyboard/keyboard.xml
  72. +6 −0 mythtv/themes/MythCenter-wide/music-base.xml
  73. +1 −105 mythtv/themes/MythCenter-wide/music-ui.xml
  74. +0 −14 mythtv/themes/MythCenter-wide/mythburn-ui.xml
  75. +0 −14 mythtv/themes/MythCenter-wide/recordings-ui.xml
  76. +0 −70 mythtv/themes/MythCenter-wide/schedule-ui.xml
  77. +0 −14 mythtv/themes/MythCenter-wide/zoneminder-ui.xml
@@ -1317,17 +1317,17 @@ Por Favor, Espere...</translation>
<context>
<name>ThumbFinder</name>
<message>
- <location filename="../mytharchive/thumbfinder.cpp" line="939"/>
+ <location filename="../mytharchive/thumbfinder.cpp" line="938"/>
<source>Exit, Save Thumbnails</source>
<translation>Salir, Guardar Miniaturas</translation>
</message>
<message>
- <location filename="../mytharchive/thumbfinder.cpp" line="940"/>
+ <location filename="../mytharchive/thumbfinder.cpp" line="939"/>
<source>Exit, Don&apos;t Save Thumbnails</source>
<translation>Salir, No Guardar Miniaturas</translation>
</message>
<message>
- <location filename="../mytharchive/thumbfinder.cpp" line="932"/>
+ <location filename="../mytharchive/thumbfinder.cpp" line="931"/>
<source>Menu</source>
<translation>Menú</translation>
</message>
@@ -34,32 +34,32 @@
<translation>Intérprete</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1389"/>
+ <location filename="../mythmusic/metadata.cpp" line="1390"/>
<source>unknown</source>
<translation>desconocido</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1390"/>
+ <location filename="../mythmusic/metadata.cpp" line="1391"/>
<source>front</source>
<translation>portada</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1391"/>
+ <location filename="../mythmusic/metadata.cpp" line="1392"/>
<source>back</source>
<translation>contraportada</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1392"/>
+ <location filename="../mythmusic/metadata.cpp" line="1393"/>
<source>cd</source>
<translation>cd</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1393"/>
+ <location filename="../mythmusic/metadata.cpp" line="1394"/>
<source>inlay</source>
<translation>interior</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1394"/>
+ <location filename="../mythmusic/metadata.cpp" line="1395"/>
<source>artist</source>
<translation>intérprete</translation>
</message>
@@ -922,147 +922,147 @@ Do you want to continue playing in the background?</source>
<context>
<name>MythControls</name>
<message>
- <location filename="../mythmusic/main.cpp" line="543"/>
+ <location filename="../mythmusic/main.cpp" line="545"/>
<source>Play music</source>
<translation>Reproducir</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="545"/>
+ <location filename="../mythmusic/main.cpp" line="547"/>
<source>Select music playlists</source>
<translation>Seleccionar listas de música</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="547"/>
+ <location filename="../mythmusic/main.cpp" line="549"/>
<source>Rip CD</source>
<translation>Importar CD</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="549"/>
+ <location filename="../mythmusic/main.cpp" line="551"/>
<source>Scan music</source>
<translation>Explorar música</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="551"/>
+ <location filename="../mythmusic/main.cpp" line="553"/>
<source>Show Music Miniplayer</source>
<translation>Mostrar Minirreproductor</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="554"/>
+ <location filename="../mythmusic/main.cpp" line="556"/>
<source>Move to the next track</source>
<translation>Pista siguiente</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="556"/>
+ <location filename="../mythmusic/main.cpp" line="558"/>
<source>Move to the previous track</source>
<translation>Pista anterior</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="558"/>
+ <location filename="../mythmusic/main.cpp" line="560"/>
<source>Fast forward</source>
<translation>Avance rápido</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="560"/>
+ <location filename="../mythmusic/main.cpp" line="562"/>
<source>Rewind</source>
<translation>Rebobinar</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="562"/>
+ <location filename="../mythmusic/main.cpp" line="564"/>
<source>Pause/Start playback</source>
<translation>Pausa/Iniciar reproducción</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="564"/>
+ <location filename="../mythmusic/main.cpp" line="566"/>
<source>Start playback</source>
<translation>Iniciar reproducción</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="566"/>
+ <location filename="../mythmusic/main.cpp" line="568"/>
<source>Stop playback</source>
<translation>Detener reproducción</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="568"/>
+ <location filename="../mythmusic/main.cpp" line="570"/>
<source>Volume down</source>
<translation>Bajar volumen</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="570"/>
+ <location filename="../mythmusic/main.cpp" line="572"/>
<source>Volume up</source>
<translation>Subir volumen</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="572"/>
+ <location filename="../mythmusic/main.cpp" line="574"/>
<source>Mute</source>
<translation>Silenciar</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="574"/>
+ <location filename="../mythmusic/main.cpp" line="576"/>
<source>Toggle audio upmixer</source>
<translation>Conmutar mezclador de sonido</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="576"/>
+ <location filename="../mythmusic/main.cpp" line="578"/>
<source>Cycle visualizer mode</source>
<translation>Rotar modo de visualización</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="578"/>
+ <location filename="../mythmusic/main.cpp" line="580"/>
<source>Blank screen</source>
<translation>Pantalla en blanco</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="580"/>
+ <location filename="../mythmusic/main.cpp" line="582"/>
<source>Increase rating</source>
<translation>Aumentar puntuación</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="582"/>
+ <location filename="../mythmusic/main.cpp" line="584"/>
<source>Decrease rating</source>
<translation>Disminuir puntuación</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="584"/>
+ <location filename="../mythmusic/main.cpp" line="586"/>
<source>Refresh music tree</source>
<translation>Refrescar árbol de música</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="586"/>
+ <location filename="../mythmusic/main.cpp" line="588"/>
<source>Filter All My Music</source>
<translation>Filtrar Toda Mi Música</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="588"/>
+ <location filename="../mythmusic/main.cpp" line="590"/>
<source>Show incremental search dialog</source>
<translation>Mostrar diálogo de búsqueda progresiva</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="590"/>
+ <location filename="../mythmusic/main.cpp" line="592"/>
<source>Incremental search find next match</source>
<translation>Búsqueda progresiva - buscar siguiente coincidencia</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="592"/>
+ <location filename="../mythmusic/main.cpp" line="594"/>
<source>Increase Play Speed</source>
<translation>Aumentar Velocidad de Reproducción</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="594"/>
+ <location filename="../mythmusic/main.cpp" line="596"/>
<source>Decrease Play Speed</source>
<translation>Disminuir Velocidad de Reproducción</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="596"/>
+ <location filename="../mythmusic/main.cpp" line="598"/>
<source>Toggle track selection</source>
<translation>Conmutar selección de pista</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="603"/>
+ <location filename="../mythmusic/main.cpp" line="605"/>
<source>MythMusic Media Handler 1/2</source>
<translation>Gestor de Medios de MythMusic 1/2</translation>
</message>
<message>
- <location filename="../mythmusic/main.cpp" line="606"/>
+ <location filename="../mythmusic/main.cpp" line="608"/>
<source>MythMusic Media Handler 2/2</source>
<translation>Gestor de Medios de MythMusic 2/2</translation>
</message>
@@ -1295,12 +1295,12 @@ Do you want to continue playing in the background?</source>
<translation>Actualizando la base de datos de música</translation>
</message>
<message>
- <location filename="../mythmusic/cddecoder.cpp" line="766"/>
+ <location filename="../mythmusic/cddecoder.cpp" line="768"/>
<source>Various Artists</source>
<translation>Varios Intérpretes</translation>
</message>
<message>
- <location filename="../mythmusic/cddecoder.cpp" line="840"/>
+ <location filename="../mythmusic/cddecoder.cpp" line="842"/>
<source>Audio CD parser</source>
<translation>Analizador de CD de audio</translation>
</message>
@@ -1335,27 +1335,27 @@ Do you want to continue playing in the background?</source>
<translation>CD -- ninguno</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1406"/>
+ <location filename="../mythmusic/metadata.cpp" line="1408"/>
<source>front</source>
<translation>portada</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1409"/>
+ <location filename="../mythmusic/metadata.cpp" line="1411"/>
<source>back</source>
<translation>contraportada</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1412"/>
+ <location filename="../mythmusic/metadata.cpp" line="1414"/>
<source>inlay</source>
<translation>interior</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1415"/>
+ <location filename="../mythmusic/metadata.cpp" line="1417"/>
<source>cd</source>
<translation>cd</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1418"/>
+ <location filename="../mythmusic/metadata.cpp" line="1420"/>
<source>cover</source>
<translation>versión</translation>
</message>
@@ -1370,18 +1370,18 @@ Do you want to continue playing in the background?</source>
<translation>Algo va Mal</translation>
</message>
<message>
- <location filename="../mythmusic/playlist.cpp" line="549"/>
- <location filename="../mythmusic/playlist.cpp" line="590"/>
+ <location filename="../mythmusic/playlist.cpp" line="561"/>
+ <location filename="../mythmusic/playlist.cpp" line="602"/>
<source>Default Playlist</source>
<translation>Lista de Reproducción Predeterminada</translation>
</message>
<message>
- <location filename="../mythmusic/playlist.cpp" line="1228"/>
+ <location filename="../mythmusic/playlist.cpp" line="1240"/>
<source>Creating CD File System</source>
<translation>Creando Sistema de Archivos en el CD</translation>
</message>
<message>
- <location filename="../mythmusic/playlist.cpp" line="1277"/>
+ <location filename="../mythmusic/playlist.cpp" line="1289"/>
<source>Burning CD</source>
<translation>Grabando CD</translation>
</message>
@@ -1391,7 +1391,7 @@ Do you want to continue playing in the background?</source>
<translation>¿?</translation>
</message>
<message>
- <location filename="../mythmusic/cddecoder.cpp" line="775"/>
+ <location filename="../mythmusic/cddecoder.cpp" line="777"/>
<source>Track %1</source>
<translation>Pista %1</translation>
</message>
@@ -1401,7 +1401,7 @@ Do you want to continue playing in the background?</source>
<translation>Explorando archivos de música</translation>
</message>
<message>
- <location filename="../mythmusic/metadata.cpp" line="1575"/>
+ <location filename="../mythmusic/metadata.cpp" line="1577"/>
<source>Rebuilding music tree</source>
<translation>Reconstruyendo árbol música</translation>
</message>
@@ -1426,7 +1426,7 @@ Do you want to continue playing in the background?</source>
<translation>Explorando Arte del Álbum</translation>
</message>
<message>
- <location filename="../mythmusic/avfdecoder.cpp" line="545"/>
+ <location filename="../mythmusic/avfdecoder.cpp" line="546"/>
<source>Internal Decoder</source>
<translation>Descodificador Interno</translation>
</message>
@@ -2907,7 +2907,7 @@ Do you want to permanently delete the existing file(s)?</source>
<context>
<name>Visualizers</name>
<message>
- <location filename="../mythmusic/bumpscope.cpp" line="564"/>
+ <location filename="../mythmusic/bumpscope.cpp" line="566"/>
<source>BumpScope</source>
<translation>BumpScope</translation>
</message>
@@ -2917,7 +2917,7 @@ Do you want to permanently delete the existing file(s)?</source>
<translation>Goom</translation>
</message>
<message>
- <location filename="../mythmusic/synaesthesia.cpp" line="650"/>
+ <location filename="../mythmusic/synaesthesia.cpp" line="652"/>
<source>Synaesthesia</source>
<translation>Synaesthesia</translation>
</message>
@@ -143,6 +143,11 @@ bool avfDecoder::initialize()
m_inputIsFile = !input()->isSequential();
+ if (m_inputContext)
+ avformat_free_context(m_inputContext);
+
+ m_inputContext = avformat_alloc_context();
+
// open device
if (m_inputIsFile)
{
@@ -585,18 +585,28 @@ static void setupKeys(void)
"Decrease rating"), "7");
REG_KEY("Music", "REFRESH", QT_TRANSLATE_NOOP("MythControls",
"Refresh music tree"), "8");
- REG_KEY("Music", "FILTER", QT_TRANSLATE_NOOP("MythControls",
- "Filter All My Music"), "F");
- REG_KEY("Music", "INCSEARCH", QT_TRANSLATE_NOOP("MythControls",
- "Show incremental search dialog"), "Ctrl+S");
- REG_KEY("Music", "INCSEARCHNEXT", QT_TRANSLATE_NOOP("MythControls",
- "Incremental search find next match"), "Ctrl+N");
REG_KEY("Music", "SPEEDUP", QT_TRANSLATE_NOOP("MythControls",
"Increase Play Speed"), "W");
REG_KEY("Music", "SPEEDDOWN", QT_TRANSLATE_NOOP("MythControls",
"Decrease Play Speed"), "X");
REG_KEY("Music", "MARK", QT_TRANSLATE_NOOP("MythControls",
"Toggle track selection"), "T");
+ REG_KEY("Music", "TOGGLESHUFFLE", QT_TRANSLATE_NOOP("MythControls",
+ "Toggle shuffle mode"), "");
+ REG_KEY("Music", "TOGGLEREPEAT", QT_TRANSLATE_NOOP("MythControls",
+ "Toggle repeat mode"), "");
+
+ // switch to view key bindings
+ REG_KEY("Music", "SWITCHTOPLAYLIST", QT_TRANSLATE_NOOP("MythControls",
+ "Switch to the current playlist view"), "");
+ REG_KEY("Music", "SWITCHTOPLAYLISTEDITORTREE", QT_TRANSLATE_NOOP("MythControls",
+ "Switch to the playlist editor tree view"), "");
+ REG_KEY("Music", "SWITCHTOPLAYLISTEDITORGALLERY", QT_TRANSLATE_NOOP("MythControls",
+ "Switch to the playlist editor gallery view"), "");
+ REG_KEY("Music", "SWITCHTOSEARCH", QT_TRANSLATE_NOOP("MythControls",
+ "Switch to the search view"), "");
+ REG_KEY("Music", "SWITCHTOVISUALISER", QT_TRANSLATE_NOOP("MythControls",
+ "Switch to the fullscreen visualiser view"), "");
#ifdef FIXME
Oops, something went wrong.

0 comments on commit b43eb75

Please sign in to comment.