Skip to content
Permalink
Browse files

MythMusic: Convert to MythUI and remove the last of the Qt3 stuff

This is far from complete and is subject to change but it's a start.
  • Loading branch information
Paul Harrison
Paul Harrison committed Jan 4, 2012
1 parent 8e9d2a0 commit 8e29824366e2957a0b9764d0e9abbfb850d80287
Showing with 10,597 additions and 12,773 deletions.
  1. +141 −168 mythplugins/mythmusic/mythmusic/bumpscope.cpp
  2. +29 −34 mythplugins/mythmusic/mythmusic/bumpscope.h
  3. +0 −1,373 mythplugins/mythmusic/mythmusic/databasebox.cpp
  4. +0 −121 mythplugins/mythmusic/mythmusic/databasebox.h
  5. +17 −7 mythplugins/mythmusic/mythmusic/decoderhandler.cpp
  6. +30 −27 mythplugins/mythmusic/mythmusic/editmetadata.cpp
  7. +0 −4 mythplugins/mythmusic/mythmusic/editmetadata.h
  8. +2 −4 mythplugins/mythmusic/mythmusic/filescanner.cpp
  9. +9 −391 mythplugins/mythmusic/mythmusic/globalsettings.cpp
  10. +0 −44 mythplugins/mythmusic/mythmusic/globalsettings.h
  11. +36 −59 mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp
  12. +4 −11 mythplugins/mythmusic/mythmusic/goom/mythgoom.h
  13. +1 −1 mythplugins/mythmusic/mythmusic/importmusic.cpp
  14. +0 −381 mythplugins/mythmusic/mythmusic/libvisualplugin.cpp
  15. +0 −52 mythplugins/mythmusic/mythmusic/libvisualplugin.h
  16. +45 −20 mythplugins/mythmusic/mythmusic/main.cpp
  17. +101 −809 mythplugins/mythmusic/mythmusic/mainvisual.cpp
  18. +30 −173 mythplugins/mythmusic/mythmusic/mainvisual.h
  19. +108 −403 mythplugins/mythmusic/mythmusic/metadata.cpp
  20. +40 −107 mythplugins/mythmusic/mythmusic/metadata.h
  21. +2 −2 mythplugins/mythmusic/mythmusic/metaio.cpp
  22. +1 −1 mythplugins/mythmusic/mythmusic/metaioavfcomment.cpp
  23. +25 −23 mythplugins/mythmusic/mythmusic/metaioflacvorbis.cpp
  24. +56 −23 mythplugins/mythmusic/mythmusic/metaioid3.cpp
  25. +15 −14 mythplugins/mythmusic/mythmusic/metaiooggvorbis.cpp
  26. +4 −11 mythplugins/mythmusic/mythmusic/metaiotaglib.cpp
  27. +15 −13 mythplugins/mythmusic/mythmusic/metaiowavpack.cpp
  28. +4 −0 mythplugins/mythmusic/mythmusic/miniplayer.cpp
  29. +1 −1 mythplugins/mythmusic/mythmusic/miniplayer.h
  30. +1,176 −175 mythplugins/mythmusic/mythmusic/musiccommon.cpp
  31. +77 −19 mythplugins/mythmusic/mythmusic/musiccommon.h
  32. +456 −216 mythplugins/mythmusic/mythmusic/musicplayer.cpp
  33. +59 −27 mythplugins/mythmusic/mythmusic/musicplayer.h
  34. +133 −0 mythplugins/mythmusic/mythmusic/musicutils.cpp
  35. +16 −0 mythplugins/mythmusic/mythmusic/musicutils.h
  36. +0 −206 mythplugins/mythmusic/mythmusic/mythlistbox-qt3.cpp
  37. +0 −39 mythplugins/mythmusic/mythmusic/mythlistbox-qt3.h
  38. +0 −100 mythplugins/mythmusic/mythmusic/mythlistview-qt3.cpp
  39. +0 −19 mythplugins/mythmusic/mythmusic/mythlistview-qt3.h
  40. +19 −17 mythplugins/mythmusic/mythmusic/mythmusic.pro
  41. +0 −2,589 mythplugins/mythmusic/mythmusic/playbackbox.cpp
  42. +0 −229 mythplugins/mythmusic/mythmusic/playbackbox.h
  43. +620 −817 mythplugins/mythmusic/mythmusic/playlist.cpp
  44. +50 −100 mythplugins/mythmusic/mythmusic/playlist.h
  45. +53 −194 mythplugins/mythmusic/mythmusic/playlistcontainer.cpp
  46. +14 −15 mythplugins/mythmusic/mythmusic/playlistcontainer.h
  47. +1,161 −0 mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
  48. +110 −0 mythplugins/mythmusic/mythmusic/playlisteditorview.h
  49. +101 −0 mythplugins/mythmusic/mythmusic/playlistview.cpp
  50. +34 −0 mythplugins/mythmusic/mythmusic/playlistview.h
  51. +48 −3 mythplugins/mythmusic/mythmusic/pls.cpp
  52. +19 −3 mythplugins/mythmusic/mythmusic/pls.h
  53. +0 −292 mythplugins/mythmusic/mythmusic/search.cpp
  54. +0 −53 mythplugins/mythmusic/mythmusic/search.h
  55. +465 −0 mythplugins/mythmusic/mythmusic/searchview.cpp
  56. +49 −0 mythplugins/mythmusic/mythmusic/searchview.h
  57. +86 −28 mythplugins/mythmusic/mythmusic/shoutcast.cpp
  58. +1,373 −1,561 mythplugins/mythmusic/mythmusic/smartplaylist.cpp
  59. +189 −184 mythplugins/mythmusic/mythmusic/smartplaylist.h
  60. +159 −223 mythplugins/mythmusic/mythmusic/synaesthesia.cpp
  61. +18 −25 mythplugins/mythmusic/mythmusic/synaesthesia.h
  62. +0 −341 mythplugins/mythmusic/mythmusic/treebuilders.cpp
  63. +0 −117 mythplugins/mythmusic/mythmusic/treebuilders.h
  64. +0 −239 mythplugins/mythmusic/mythmusic/treecheckitem.cpp
  65. +0 −100 mythplugins/mythmusic/mythmusic/treecheckitem.h
  66. +640 −50 mythplugins/mythmusic/mythmusic/visualize.cpp
  67. +129 −8 mythplugins/mythmusic/mythmusic/visualize.h
  68. +217 −0 mythplugins/mythmusic/mythmusic/visualizerview.cpp
  69. +50 −0 mythplugins/mythmusic/mythmusic/visualizerview.h
  70. +1,498 −494 mythplugins/mythmusic/theme/default-wide/music-ui.xml
  71. BIN mythplugins/mythmusic/theme/default/images/mm_icecast.png
  72. BIN mythplugins/mythmusic/theme/default/images/mm_pauseicon.png
  73. BIN mythplugins/mythmusic/theme/default/images/mm_playicon.png
  74. BIN mythplugins/mythmusic/theme/default/images/mm_playing_1.png
  75. BIN mythplugins/mythmusic/theme/default/images/mm_playing_2.png
  76. BIN mythplugins/mythmusic/theme/default/images/mm_playing_3.png
  77. BIN mythplugins/mythmusic/theme/default/images/mm_playing_4.png
  78. BIN mythplugins/mythmusic/theme/default/images/mm_playing_5.png
  79. BIN mythplugins/mythmusic/theme/default/images/mm_playing_6.png
  80. BIN mythplugins/mythmusic/theme/default/images/mm_playing_7.png
  81. BIN mythplugins/mythmusic/theme/default/images/mm_playing_8.png
  82. BIN mythplugins/mythmusic/theme/default/images/mm_updown.png
  83. +847 −0 mythplugins/mythmusic/theme/default/music-base.xml
  84. +6 −0 mythplugins/mythmusic/theme/menus/musicmenu.xml
  85. +5 −2 mythplugins/mythmusic/theme/theme.pro
  86. +4 −11 mythtv/libs/libmythui/mythuivideo.cpp

Large diffs are not rendered by default.

@@ -7,15 +7,12 @@
#include <vector>
using namespace std;

#ifdef SDL_SUPPORT
#include <SDL.h>

#define MAX_PHONGRES 1024

class BumpScope : public VisualBase
{
public:
BumpScope(long int winid);
BumpScope();
virtual ~BumpScope();

void resize(const QSize &size);
@@ -38,9 +35,9 @@ class BumpScope : public VisualBase
void rgb_to_hsv(unsigned int color, double *h, double *s, double *v);
void hsv_to_rgb(double h, double s, double v, unsigned int *color);

QSize size;
QImage *m_image;

SDL_Surface *surface;
QSize m_size;

unsigned int m_color;
unsigned int m_x;
@@ -49,35 +46,33 @@ class BumpScope : public VisualBase
unsigned int m_height;
unsigned int m_phongrad;

bool color_cycle;
bool moving_light;
bool diamond;

int bpl;

vector<vector<unsigned char> > phongdat;
unsigned char *rgb_buf;
double intense1[256];
double intense2[256];

int iangle;
int ixo;
int iyo;
int ixd;
int iyd;
int ilx;
int ily;
int was_moving;
int was_color;
double ih;
double is;
double iv;
double isd;
int ihd;
unsigned int icolor;
bool m_color_cycle;
bool m_moving_light;
bool m_diamond;

int m_bpl;

vector<vector<unsigned char> > m_phongdat;
unsigned char *m_rgb_buf;
double m_intense1[256];
double m_intense2[256];

int m_iangle;
int m_ixo;
int m_iyo;
int m_ixd;
int m_iyd;
int m_ilx;
int m_ily;
int m_was_moving;
int m_was_color;
double m_ih;
double m_is;
double m_iv;
double m_isd;
int m_ihd;
unsigned int m_icolor;
};


#endif

#endif // __mainvisual_h

0 comments on commit 8e29824

Please sign in to comment.
You can’t perform that action at this time.