comparison src/projectm-1.0/main.cxx @ 2246:f06b48381052

- drop protected: declarations, protected: is not needed here (and causes error on gcc4.3) - new screenshot code

2245:0edf1cb262c0

extern "C" void projectM_xmms_init(void);
extern "C" void projectM_cleanup(void);
extern "C" void projectM_render_pcm(gint16 pcm_data[2][512]);
extern "C" int worker_func(void *);
std::string read_config();
void saveSnapshotToFile();

extern "C" VisPlugin projectM_vtable;

int SDLThreadWrapper(void *);
void handle_playback_trigger(void *, void *);

    SDL_Event event;
    SDL_Surface *screen;
    SDL_Thread *worker_thread;
    SDL_sem *sem;

  protected:
    projectMPlugin()
    {
        std::string configFile = read_config();
        ConfigFile config(configFile);

        this->pm = 0;

        aud_hook_dissociate("playback begin", handle_playback_trigger);
    }

  public:
    int run(void *unused)
    {
        if (error)
            return -1;

                {
                  case PROJECTM_KEYDOWN:
                      switch (key)
                      {
                        case PROJECTM_K_c:
                            saveSnapshotToFile();
                            break;

                        case PROJECTM_K_f:
                            int w, h;
                            if (fullscreen == 0)

    void triggerPlaybackBegin(PlaylistEntry *entry)
    {
        std::string title(entry->title);
        this->pm->projectM_setTitle(title);
    }
};

/* glue to implementation section */
projectMPlugin *thePlugin = 0;

    }

    abort();
}

int frame = 1;


void saveSnapshotToFile()
{
    char dumpPath[512];
    char Home[512];
    //char *home;

    SDL_Surface *bitmap;

    GLint viewport[4];
    long bytewidth;
    GLint width, height;
    long bytes;

    glReadBuffer(GL_FRONT);
    glGetIntegerv(GL_VIEWPORT, viewport);

    width = viewport[2];
    height = viewport[3];

    bytewidth = width * 4;
    bytewidth = (bytewidth + 3) & ~3;
    bytes = bytewidth * height;

    /*
       glFinish();
       glPixelStorei(GL_PACK_ALIGNMENT, 4);
       glPixelStorei(GL_PACK_ROW_LENGTH, 0);
       glPixelStorei(GL_PACK_SKIP_ROWS, 0);
       glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
     */


    bitmap = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32, 0, 0, 0, 0);
    glReadPixels(0, 0, width, height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, bitmap->pixels);

    sprintf(dumpPath, "/.projectM/%.8d.bmp", frame++);
    // home=getenv("HOME");
    strcpy(Home, getenv("HOME"));
    strcpy(Home + strlen(Home), dumpPath);
    Home[strlen(Home)] = '\0';
    SDL_SaveBMP(bitmap, Home);

    SDL_FreeSurface(bitmap);


}

2246:f06b48381052

extern "C" void projectM_xmms_init(void);
extern "C" void projectM_cleanup(void);
extern "C" void projectM_render_pcm(gint16 pcm_data[2][512]);
extern "C" int worker_func(void *);
std::string read_config();

extern "C" VisPlugin projectM_vtable;

int SDLThreadWrapper(void *);
void handle_playback_trigger(void *, void *);

    SDL_Event event;
    SDL_Surface *screen;
    SDL_Thread *worker_thread;
    SDL_sem *sem;

  public:
    projectMPlugin()
    {
        std::string configFile = read_config();
        ConfigFile config(configFile);

        this->pm = 0;

        aud_hook_dissociate("playback begin", handle_playback_trigger);
    }

    int run(void *unused)
    {
        if (error)
            return -1;

                {
                  case PROJECTM_KEYDOWN:
                      switch (key)
                      {
                        case PROJECTM_K_c:
                            this->takeScreenshot();
                            break;

                        case PROJECTM_K_f:
                            int w, h;
                            if (fullscreen == 0)

    void triggerPlaybackBegin(PlaylistEntry *entry)
    {
        std::string title(entry->title);
        this->pm->projectM_setTitle(title);
    }

    void takeScreenshot(void)
    {
        static int frame = 1;

        std::string dumpPath(g_get_home_dir());
        dumpPath.append(".projectM/");

        gchar *frame_ = g_strdup_printf("%.8d.bmp", frame);

        dumpPath.append(frame_);

        SDL_Surface *bitmap;

        GLint viewport[4];
        long bytewidth;
        GLint width, height;
        long bytes;

        glReadBuffer(GL_FRONT);
        glGetIntegerv(GL_VIEWPORT, viewport);

        width = viewport[2];
        height = viewport[3];

        bytewidth = width * 4;
        bytewidth = (bytewidth + 3) & ~3;
        bytes = bytewidth * height;

        bitmap = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32, 0, 0, 0, 0);
        glReadPixels(0, 0, width, height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, bitmap->pixels);

        SDL_SaveBMP(bitmap, dumpPath.c_str());

        SDL_FreeSurface(bitmap);

        frame++;
    }
};

/* glue to implementation section */
projectMPlugin *thePlugin = 0;

    }

    abort();
}