[OpenNeo-CVS] openneo/apps all_menus.c,1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/openneo/openneo/apps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19124

Modified Files:
	all_menus.c 
Log Message:
Set the correct flags with action function codes

Index: all_menus.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/all_menus.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** all_menus.c	26 Jun 2004 00:04:20 -0000	1.1
--- all_menus.c	26 Jun 2004 22:54:32 -0000	1.2
***************
*** 53,58 ****
    struct menu menu;
    struct menu_item items[] = {
!     { "Current Playlist",     GO_VIEW_PLAYLIST     },
!     // { "Bookmark List",        GO_VIEW_BOOKMARKS },
      { str(LANG_TRACK_INFO),           DO_VIEW_SONG_INFO    },
      { str(LANG_NEO_INFO),             GO_NEO_MENU          }
--- 53,58 ----
    struct menu menu;
    struct menu_item items[] = {
!     { "Current Playlist",             GO_VIEW_PLAYLIST     },
!     // { "Bookmark List",             GO_VIEW_BOOKMARKS },
      { str(LANG_TRACK_INFO),           DO_VIEW_SONG_INFO    },
      { str(LANG_NEO_INFO),             GO_NEO_MENU          }
***************
*** 70,76 ****
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_AUDIO),       GO_AUDIO_MENU          },
      { str(LANG_PLAYER),              GO_PLAYER_MENU         },
!     //  { "Create Bookmark",     DO_CREATE_BOOKMARK },
      { str(LANG_CLEAR_PLAYLIST),      DO_CLEAR_PLAYLIST      },
      { str(LANG_SAVE_PLAYLIST),       DO_SAVE_PLAYLIST       },
--- 70,76 ----
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_AUDIO),               GO_AUDIO_MENU          },
      { str(LANG_PLAYER),              GO_PLAYER_MENU         },
!     //  { "Create Bookmark",         DO_CREATE_BOOKMARK },
      { str(LANG_CLEAR_PLAYLIST),      DO_CLEAR_PLAYLIST      },
      { str(LANG_SAVE_PLAYLIST),       DO_SAVE_PLAYLIST       },
***************
*** 88,98 ****
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_VOLUME),       DO_CHANGE_VOLUME   },
!     { str(LANG_BASS),         DO_CHANGE_BASS     },
!     { str(LANG_TREBLE),       DO_CHANGE_TREBLE   },
!     { str(LANG_BALANCE),      DO_CHANGE_BALANCE  },
!     { str(LANG_CHANNEL_MENU), DO_TOGGLE_CHANNEL  },
!     { str(LANG_PITCH),        DO_CHANGE_PITCH    },
!     { str(LANG_MUTE),         DO_TOGGLE_MUTE     }
    };
    
--- 88,98 ----
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_VOLUME),       DO_CHANGE_VOLUME|ACTION_VERBAL_ASK   },
!     { str(LANG_BASS),         DO_CHANGE_BASS|ACTION_VERBAL_ASK     },
!     { str(LANG_TREBLE),       DO_CHANGE_TREBLE|ACTION_VERBAL_ASK   },
!     { str(LANG_BALANCE),      DO_CHANGE_BALANCE|ACTION_VERBAL_ASK  },
!     { str(LANG_CHANNEL_MENU), DO_TOGGLE_CHANNEL|ACTION_VERBAL_ASK  },
!     { str(LANG_PITCH),        DO_CHANGE_PITCH|ACTION_VERBAL_ASK    },
!     { str(LANG_MUTE),         DO_TOGGLE_MUTE|ACTION_VERBAL_ASK     }
    };
    
***************
*** 114,119 ****
      //{ str(LANG_AUTO_BOOKMARK),    DO_CHANGE_AUTOBOOKMARK },
      { str(LANG_SCROLL_MENU),      GO_SCROLL_MENU           },
!     { str(LANG_EXPORT_SETTINGS),  DO_EXPORT_SETTINGS       },
!     { str(LANG_RESET_SETTINGS),   DO_RESET_SETTINGS        }
    };
    
--- 114,119 ----
      //{ str(LANG_AUTO_BOOKMARK),    DO_CHANGE_AUTOBOOKMARK },
      { str(LANG_SCROLL_MENU),      GO_SCROLL_MENU           },
!     { str(LANG_EXPORT_SETTINGS),  DO_EXPORT_SETTINGS|ACTION_VERBAL_ASK       },
!     { str(LANG_RESET_SETTINGS),   DO_RESET_SETTINGS|ACTION_VERBAL_ASK        }
    };
    
***************
*** 129,134 ****
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_SHUFFLE),           DO_TOGGLE_SHUFFLE  },
!     { str(LANG_REPEAT),            DO_TOGGLE_REPEAT   },
      { str(LANG_PLAY),              DO_PLAY_PAUSE      },
      { str(LANG_STOP),              DO_STOP            },
--- 129,134 ----
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_SHUFFLE),           DO_TOGGLE_SHUFFLE|ACTION_VERBAL_ASK  },
!     { str(LANG_REPEAT),            DO_TOGGLE_REPEAT|ACTION_VERBAL_ASK   },
      { str(LANG_PLAY),              DO_PLAY_PAUSE      },
      { str(LANG_STOP),              DO_STOP            },
***************
*** 147,153 ****
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_ENABLE_RESUME),    DO_CHANGE_RESUME_SETTING  },
!     { "Resume Source",            DO_CHANGE_RESUME_SOURCE   },
!     { str(LANG_RESUME_ROLLBACK),  DO_CHANGE_RESUME_ROLLBACK }
    };
    
--- 147,153 ----
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_ENABLE_RESUME),    DO_CHANGE_RESUME_SETTING|ACTION_VERBAL_ASK  },
!     { "Resume Source",            DO_CHANGE_RESUME_SOURCE|ACTION_VERBAL_ASK   },
!     { str(LANG_RESUME_ROLLBACK),  DO_CHANGE_RESUME_ROLLBACK|ACTION_VERBAL_ASK }
    };
    
***************
*** 162,170 ****
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_SCROLL_SPEED),      DO_CHANGE_SCROLL_SPEED  },
!     { str(LANG_SCROLL_DELAY),      DO_CHANGE_SCROLL_DELAY  },  
!     { str(LANG_BIDIR_SCROLL),      DO_CHANGE_BIDI_LIMIT    },
!     { str(LANG_JUMP_SCROLL),       DO_CHANGE_JUMP_SCROLL   },
!     { str(LANG_JUMP_SCROLL_DELAY), DO_CHANGE_JUMP_DELAY    }
    };
    
--- 162,170 ----
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_SCROLL_SPEED),      DO_CHANGE_SCROLL_SPEED|ACTION_VERBAL_ASK  },
!     { str(LANG_SCROLL_DELAY),      DO_CHANGE_SCROLL_DELAY|ACTION_VERBAL_ASK  },  
!     { str(LANG_BIDIR_SCROLL),      DO_CHANGE_BIDI_LIMIT|ACTION_VERBAL_ASK    },
!     { str(LANG_JUMP_SCROLL),       DO_CHANGE_JUMP_SCROLL|ACTION_VERBAL_ASK   },
!     { str(LANG_JUMP_SCROLL_DELAY), DO_CHANGE_JUMP_DELAY|ACTION_VERBAL_ASK    }
    };
    
***************
*** 179,186 ****
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_OPEN_NEO),       DO_VIEW_NEO_INFO     },
!     { str(LANG_MEMORY),		DO_VIEW_MEMORY_INFO  },
!     { str(LANG_HARD_DISK),	DO_VIEW_HD_INFO      },
!     { str(LANG_MPEG_DECODER),	DO_VIEW_MPEG_INFO    }
    };
    
--- 179,186 ----
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_OPEN_NEO),       DO_VIEW_NEO_INFO|ACTION_VERBAL     },
!     { str(LANG_MEMORY),		DO_VIEW_MEMORY_INFO|ACTION_VERBAL  },
!     { str(LANG_HARD_DISK),	DO_VIEW_HD_INFO|ACTION_VERBAL      },
!     { str(LANG_MPEG_DECODER),	DO_VIEW_MPEG_INFO|ACTION_VERBAL    }
    };
    
***************
*** 195,206 ****
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_PLAY_SELECTED),     DO_CHANGE_PLAY_SELECTED   },
!     { str(LANG_FFRW_STEP),         DO_CHANGE_FFRW_STEP       },
!     { str(LANG_FFRW_ACCEL),        DO_CHANGE_FFRW_ACCEL      },
!     { str(LANG_FADE_ON_STOP),      DO_CHANGE_FADE            },
!     { str(LANG_USE_VOLUME_SLIDER), DO_CHANGE_USE_VOL_SLIDER  },
!     { str(LANG_VOLUME_FORMAT),     DO_CHANGE_VOL_FORMAT      },  
!     { str(LANG_VOLUME_RANGE),      DO_CHANGE_VOL_RANGE       },
!     { str(LANG_SHOW_VOLUME_UNITS), DO_CHANGE_VOL_SHOW_UNITS  }
    };
    
--- 195,206 ----
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_PLAY_SELECTED),     DO_CHANGE_PLAY_SELECTED|ACTION_VERBAL_ASK   },
!     { str(LANG_FFRW_STEP),         DO_CHANGE_FFRW_STEP|ACTION_VERBAL_ASK       },
!     { str(LANG_FFRW_ACCEL),        DO_CHANGE_FFRW_ACCEL|ACTION_VERBAL_ASK      },
!     { str(LANG_FADE_ON_STOP),      DO_CHANGE_FADE|ACTION_VERBAL_ASK            },
!     { str(LANG_USE_VOLUME_SLIDER), DO_CHANGE_USE_VOL_SLIDER|ACTION_VERBAL_ASK  },
!     { str(LANG_VOLUME_FORMAT),     DO_CHANGE_VOL_FORMAT|ACTION_VERBAL_ASK      },  
!     { str(LANG_VOLUME_RANGE),      DO_CHANGE_VOL_RANGE|ACTION_VERBAL_ASK       },
!     { str(LANG_SHOW_VOLUME_UNITS), DO_CHANGE_VOL_SHOW_UNITS|ACTION_VERBAL_ASK  }
    };
    
***************
*** 215,223 ****
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_CASE_MENU),    DO_CHANGE_SORT_MODE                    },
!     { str(LANG_FILTER),       DO_CHANGE_FILE_FILTER                  },
!     { str(LANG_SHOW_ICONS),   DO_TOGGLE_SHOW_ICONS                   },
!     { str(LANG_FOLLOW),       DO_TOGGLE_FOLLOW_PLAYLIST              },
!     { "Screen Step",          DO_CHANGE_SCREEN_STEP                  },
    };
    menu.items = items;
--- 215,223 ----
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_CASE_MENU),    DO_CHANGE_SORT_MODE|ACTION_VERBAL_ASK                    },
!     { str(LANG_FILTER),       DO_CHANGE_FILE_FILTER|ACTION_VERBAL_ASK                  },
!     { str(LANG_SHOW_ICONS),   DO_TOGGLE_SHOW_ICONS|ACTION_VERBAL_ASK                   },
!     { str(LANG_FOLLOW),       DO_TOGGLE_FOLLOW_PLAYLIST|ACTION_VERBAL_ASK              },
!     { "Screen Step",          DO_CHANGE_SCREEN_STEP|ACTION_VERBAL_ASK                  },
    };
    menu.items = items;
***************
*** 231,238 ****
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_VOLUME_MODE),    DO_CHANGE_VOL_MODE                   },
!     { str(LANG_REVERSE_OUTPUT), DO_REVERSE_OUTPUT                    },
  #ifdef VOICE
!     { str(LANG_ENABLE_VOICE),   DO_ENABLE_VOICE                      },
  #endif
    };
--- 231,238 ----
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_VOLUME_MODE),    DO_CHANGE_VOL_MODE|ACTION_VERBAL_ASK                   },
!     { str(LANG_REVERSE_OUTPUT), DO_REVERSE_OUTPUT|ACTION_VERBAL_ASK                    },
  #ifdef VOICE
!     { str(LANG_ENABLE_VOICE),   DO_ENABLE_VOICE|ACTION_VERBAL_ASK                      },
  #endif
    };
***************
*** 247,251 ****
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_DELETE_PLAYLIST_CTRL),    DO_DELETE_PLAYLIST_CTRL       }
    };
    menu.items = items;
--- 247,251 ----
    struct menu menu;
    struct menu_item items[] = {
!     { str(LANG_DELETE_PLAYLIST_CTRL),    DO_DELETE_PLAYLIST_CTRL|ACTION_VERBAL_ASK       }
    };
    menu.items = items;