view src/video/ps3/SDL_ps3modes.c @ 5080:6d94060d16a9

Fixed bug #1011 Daniel Ellis 2010-06-25 15:20:31 PDT SDL based applications sometimes display the wrong application name in the Sound Preferences dialog when using pulseaudio. I can see from the code that the SDL pulse module is initiating a new pulse audio context and passing an application name using the function get_progname(). The get_progname() function returns the name of the current process. However, the process name is often not a suitable name to use. For example, the OpenShot video editor is a python application, and so "python" is displayed in the Sound Preferences window (see Bug #596504), when it should be displaying "OpenShot". PulseAudio allows applications to specify the application name, either at the time the context is created (as SDL does currently), or by special environment variables (see http://www.pulseaudio.org/wiki/ApplicationProperties). If no name is specified, then pulseaudio will determine the name based on the process. If you specify the application name when initiating the pulseaudio context, then that will override any application name specified using an environment variable. As libsdl is a library, I believe the solution is for libsdl to not specify any application name when initiating a pulseaudio context, which will enable applications to specify the application name using environment variables. In the case that the applications do not specify anything, pulseaudio will fall back to using the process name anyway. The attached patch removes the get_progname() function and passes NULL as the application name when creating the pulseaudio context, which fixes the issue.
author Sam Lantinga <slouken@libsdl.org>
date Sun, 23 Jan 2011 21:55:04 -0800
parents f7b03b6838cb
children
line wrap: on
line source

/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2010 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

    Sam Lantinga
    slouken@libsdl.org
*/
#include "SDL_config.h"

#include "SDL_ps3video.h"

void
PS3_InitModes(_THIS)
{
    deprintf(1, "+PS3_InitModes()\n");
    SDL_VideoDisplay display;
    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
    SDL_DisplayMode mode;
    PS3_DisplayModeData *modedata;
    unsigned long vid = 0;

    modedata = (PS3_DisplayModeData *) SDL_malloc(sizeof(*modedata));
    if (!modedata) {
        return;
    }

    /* Setting up the DisplayMode based on current settings */
    struct ps3fb_ioctl_res res;
    if (ioctl(data->fbdev, PS3FB_IOCTL_SCREENINFO, &res)) {
        SDL_SetError("Can't get PS3FB_IOCTL_SCREENINFO");
    }
    mode.format = SDL_PIXELFORMAT_RGB888;
    mode.refresh_rate = 0;
    mode.w = res.xres;
    mode.h = res.yres;

    /* Setting up driver specific mode data,
     * Get the current ps3 specific videmode number */
    if (ioctl(data->fbdev, PS3FB_IOCTL_GETMODE, (unsigned long)&vid)) {
        SDL_SetError("Can't get PS3FB_IOCTL_GETMODE");
    }
    deprintf(2, "PS3FB_IOCTL_GETMODE = %u\n", vid);
    modedata->mode = vid;
    mode.driverdata = modedata;

    /* Set display's videomode and add it */
    SDL_zero(display);
    display.desktop_mode = mode;
    display.current_mode = mode;

    SDL_AddVideoDisplay(&display);
    deprintf(1, "-PS3_InitModes()\n");
}

/* DisplayModes available on the PS3 */
static SDL_DisplayMode ps3fb_modedb[] = {
    /* VESA */
    {SDL_PIXELFORMAT_RGB888, 1280, 768, 0, NULL}, // WXGA
    {SDL_PIXELFORMAT_RGB888, 1280, 1024, 0, NULL}, // SXGA
    {SDL_PIXELFORMAT_RGB888, 1920, 1200, 0, NULL}, // WUXGA
    /* Native resolutions (progressive, "fullscreen") */
    {SDL_PIXELFORMAT_RGB888, 720, 480, 0, NULL}, // 480p
    {SDL_PIXELFORMAT_RGB888, 1280, 720, 0, NULL}, // 720p
    {SDL_PIXELFORMAT_RGB888, 1920, 1080, 0, NULL} // 1080p
};

/* PS3 videomode number according to ps3fb_modedb */
static PS3_DisplayModeData ps3fb_data[] = {
    {11}, {12}, {13}, {130}, {131}, {133}, 
};

void
PS3_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
{
    deprintf(1, "+PS3_GetDisplayModes()\n");
    SDL_DisplayMode mode;
    unsigned int nummodes;

    nummodes = sizeof(ps3fb_modedb) / sizeof(SDL_DisplayMode);

    int n;
    for (n=0; n<nummodes; ++n) {
        /* Get driver specific mode data */
        ps3fb_modedb[n].driverdata = &ps3fb_data[n];

        /* Add DisplayMode to list */
        deprintf(2, "Adding resolution %u x %u\n", ps3fb_modedb[n].w, ps3fb_modedb[n].h);
        SDL_AddDisplayMode(display, &ps3fb_modedb[n]);
    }
    deprintf(1, "-PS3_GetDisplayModes()\n");
}

int
PS3_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
{
    deprintf(1, "+PS3_SetDisplayMode()\n");
    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
    PS3_DisplayModeData *dispdata = (PS3_DisplayModeData *) mode->driverdata;

    /* Set the new DisplayMode */
    deprintf(2, "Setting PS3FB_MODE to %u\n", dispdata->mode);
    if (ioctl(data->fbdev, PS3FB_IOCTL_SETMODE, (unsigned long)&dispdata->mode)) {
        deprintf(2, "Could not set PS3FB_MODE\n");
        SDL_SetError("Could not set PS3FB_MODE\n");
        return -1;
    }

    deprintf(1, "-PS3_SetDisplayMode()\n");
    return 0;
}

void
PS3_QuitModes(_THIS)
{
    deprintf(1, "+PS3_QuitModes()\n");

    /* There was no mem allocated for driverdata */
    int i, j;
    for (i = 0; i < SDL_GetNumVideoDisplays(); ++i) {
        SDL_VideoDisplay *display = SDL_GetVideoDisplay(i);
        for (j = display->num_display_modes; j--;) {
            display->display_modes[j].driverdata = NULL;
        }
    }

    deprintf(1, "-PS3_QuitModes()\n");
}

/* vi: set ts=4 sw=4 expandtab: */