Skip to content

Commit

Permalink
MythMusic: Convert to MythUI and remove the last of the Qt3 stuff
Browse files Browse the repository at this point in the history
This is far from complete and is subject to change but it's a start.
  • Loading branch information
Paul Harrison committed Jan 4, 2012
1 parent 8e9d2a0 commit 8e29824
Show file tree
Hide file tree
Showing 86 changed files with 10,597 additions and 12,773 deletions.
309 changes: 141 additions & 168 deletions mythplugins/mythmusic/mythmusic/bumpscope.cpp

Large diffs are not rendered by default.

63 changes: 29 additions & 34 deletions mythplugins/mythmusic/mythmusic/bumpscope.h
Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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.