Copyright year moved from 2004 to 2006

[vlc] / include / configuration.h

diff --git a/include/configuration.h b/include/configuration.h
index b33e97f13cf54521364a1b96cff090647cd56f21..b6ffad4385d767e38daa8a73321dc707c5e1ab50 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -62,8 +62,9 @@
  *******************************************************************/
 #define CAT_INTERFACE 1
    #define SUBCAT_INTERFACE_GENERAL 101
-   #define SUBCAT_INTERFACE_CONTROL 102
-   #define SUBCAT_INTERFACE_HOTKEYS 103
+   #define SUBCAT_INTERFACE_MAIN 102
+   #define SUBCAT_INTERFACE_CONTROL 103
+   #define SUBCAT_INTERFACE_HOTKEYS 104
 
 #define CAT_AUDIO 2
    #define SUBCAT_AUDIO_GENERAL 201
@@ -80,13 +81,13 @@
    #define SUBCAT_VIDEO_SUBPIC 305
 
 #define CAT_INPUT 4
-   #define SUBCAT_INPUT_ACCESS 401
-   #define SUBCAT_INPUT_ACCESS_FILTER 402
-   #define SUBCAT_INPUT_DEMUX 403
-   #define SUBCAT_INPUT_VCODEC 404
-   #define SUBCAT_INPUT_ACODEC 405
-   #define SUBCAT_INPUT_SCODEC 406
-   #define SUBCAT_INPUT_ADVANCED 407
+   #define SUBCAT_INPUT_GENERAL 401
+   #define SUBCAT_INPUT_ACCESS 402
+   #define SUBCAT_INPUT_ACCESS_FILTER 403
+   #define SUBCAT_INPUT_DEMUX 404
+   #define SUBCAT_INPUT_VCODEC 405
+   #define SUBCAT_INPUT_ACODEC 406
+   #define SUBCAT_INPUT_SCODEC 407
 
 #define CAT_SOUT 5
    #define SUBCAT_SOUT_GENERAL 501
@@ -180,6 +181,8 @@ VLC_EXPORT( void,   __config_PutPsz,   (vlc_object_t *, const char *, const char
 
 VLC_EXPORT( int,    __config_LoadCmdLine,  ( vlc_object_t *, int *, char *[], vlc_bool_t ) );
 VLC_EXPORT( char *,   config_GetHomeDir,     ( void ) );
+VLC_EXPORT( char *,   config_GetUserDir,     ( void ) );
+VLC_EXPORT( const char *, config_GetDataDir, ( const vlc_object_t * ) );
 VLC_EXPORT( int,    __config_LoadConfigFile, ( vlc_object_t *, const char * ) );
 VLC_EXPORT( int,    __config_SaveConfigFile, ( vlc_object_t *, const char * ) );
 VLC_EXPORT( void,   __config_ResetAll, ( vlc_object_t * ) );
@@ -207,7 +210,7 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) );
 #define config_ResetAll(a) __config_ResetAll(VLC_OBJECT(a))
 
 /* internal only */
-int config_CreateDir( vlc_object_t *, char * );
+int config_CreateDir( vlc_object_t *, const char * );
 int config_AutoSaveConfigFile( vlc_object_t * );
 
 /*****************************************************************************