Full-screen key changed from Tab to F11. Screenshot removed

This commit is contained in:
Duilio Protti 2016-07-03 11:16:28 -03:00
parent db62052a6e
commit d7ec106875
5 changed files with 24 additions and 39 deletions

View File

@ -41,7 +41,7 @@ Run
Audacious -> View -> Visualizations -> Infinity
Enter / leave full-screen by pressing `Tab`.
Enter / leave full-screen by pressing `F11`.
![Screenshot of Infinity Settings](https://cloud.githubusercontent.com/assets/2084073/16421084/2d45d54a-3d2a-11e6-9919-3d6aa5733743.png "Infinity Settings")
@ -80,4 +80,4 @@ Releases older than 0.8.0beta1 can be found at Sourceforge: <https://sourceforge
Contributions
-------------
Your help is welcome either coding, testing or building distro packages.
Your feedback or help would be really appreciated.

View File

@ -6,7 +6,7 @@ Adding New Effects
- Build with --enable-debug and install
- Run Audacious on console
- Go to interactive mode (see next section) and experiment
- Go to interactive mode (see next sections) and experiment
- Press key 'm' for saving current effect to disk (will persist amongst Audacious sessions)
Modes
@ -16,33 +16,25 @@ The plugin has two modes. Default is Non-Interactive.
**Non-Interactive Mode**:
States and palettes periodically switches in a random sequence.
Built-in effects are used.
If you run Audacity from a terminal the following command keys will display on
terminal when Infinity loads:
Keys:
- Space: change effect
- Tab: toggle full-screen
- Up/Down: up/down audacity main volume
- Left/Right: reward/forward actual played song, if any
Keys:
- F11: toggle full-screen
- Up/Down: up/down sound volume
- Left/Right: reward/forward current song
- z: previous song
- x: play
- c: pause
- v: stop
- b: next song
- Enter: switch to interactive mode
(works only if infinity was configured with --enable-debug option)
- F11: screenshot
- F12: change palette
- Space: change effect
- Enter: switch to interactive mode (only if was compiled with --enable-debug)
**Interactive Mode**:
You can control the effects using keys:
You can change effects using keys:
- F12: change palette
- Tab: toggle full-screen
- Enter: switch to non-interactive mode
- F1-F10: choose transformation vector field
- a,z: change curve 1 lighting
- q,s: change curve 2 lighting
@ -51,4 +43,12 @@ You can control the effects using keys:
- w: change curve 2 type
- m: persist current effect
- mouse: change curve 2 position
- F11: screenshot
- Enter: switch to non-interactive mode
Persisted effects go to home directory and are not added to your Audacious.
If you want them to be added to your Audacious, append it to system-wide effects
file:
```
cat ~/infinite_states >> {your_prefix}/share/infinity/infinite_states
```

View File

@ -466,24 +466,11 @@ void display_toggle_fullscreen(void)
SDL_ShowCursor(is_fullscreen);
}
void display_save_screen(void)
{
gchar name[256];
(void)snprintf(name, 255, "screenshot%i%s", rand() % 1000000, ".bmp");
name[255] = '\0';
if (SDL_SaveBMP(screen, name) < 0)
g_warning("Error while saving file %s: %s", name, SDL_GetError());
else
g_message("saved");
}
inline void display_save_effect(t_effect *effect)
{
effects_append_effect(effect);
}
inline void display_load_random_effect(t_effect *effect)
{
effects_load_random_effect(effect);

View File

@ -83,7 +83,6 @@ void curve(t_effect *current_effect);
*/
void display_toggle_fullscreen(void);
void display_save_screen(void);
void display_save_effect(t_effect *effect);
void display_load_random_effect(t_effect *effect);

View File

@ -202,7 +202,7 @@ static void handle_window_event(SDL_Event *event) {
G_UNLOCK(resizing);
width = event->window.data1;
height = event->window.data2;
g_message("Infinity: Screen resized to %dx%d pixels^2", width, height);
g_message("Infinity: screen resize to %dx%d pixels", width, height);
must_resize = TRUE;
break;
/*case SDL_WINDOWEVENT_SIZE_CHANGED:
@ -241,6 +241,7 @@ static void check_events()
case SDL_WINDOWEVENT:
handle_window_event(&event); break;
case SDL_KEYDOWN:
// TODO check how this may work in a Mac keyboard
switch (event.key.keysym.sym) {
case SDLK_RIGHT:
if (player->is_playing())
@ -254,8 +255,6 @@ static void check_events()
player->adjust_volume(5); break;
case SDLK_DOWN:
player->adjust_volume(-5); break;
case SDLK_TAB:
display_toggle_fullscreen(); break;
case SDLK_z:
player->previous(); break;
case SDLK_x:
@ -267,7 +266,7 @@ static void check_events()
case SDLK_b:
player->next(); break;
case SDLK_F11:
display_save_screen(); break;
display_toggle_fullscreen(); break;
case SDLK_F12:
if (t_last_color > 32) {
t_last_color = 0;