i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Rewrote BeBuild.h which had "a few" consequences (got rid of all those class

Browse Source 
definitions).
* Minor cleanup here and there.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22577 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-10-15 20:13:55 +00:00
parent 4f6e481644
commit f6e4cbb952
135 changed files with 844 additions and 1238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/BeBuild.h
+11 -372
View File
@@ -1,387 +1,26 @@
/****************************************************************************** /*
/ * Copyright 2007, Haiku, Inc. All Rights Reserved.
/ File: BeBuild.h * Distributed under the terms of the MIT License.
/ */
/ Description: Import/export macros
/
/ Copyright 1993-98, Be Incorporated
/
*******************************************************************************/
#ifndef _BE_BUILD_H #ifndef _BE_BUILD_H
#define _BE_BUILD_H #define _BE_BUILD_H
#define B_BEOS_VERSION_4 0x0400 #define B_BEOS_VERSION_4 0x0400
#define B_BEOS_VERSION_4_5 0x0450 #define B_BEOS_VERSION_4_5 0x0450
#define B_BEOS_VERSION_5 0x0500 #define B_BEOS_VERSION_5 0x0500
#define B_BEOS_VERSION B_BEOS_VERSION_5 #define B_BEOS_VERSION B_BEOS_VERSION_5
#define B_BEOS_VERSION_MAUI B_BEOS_VERSION_5 #define B_BEOS_VERSION_MAUI B_BEOS_VERSION_5
#if defined(__POWERPC__) #define B_HAIKU_VERSION_1 0x0100
// the PowerPC build is using GCC now (BeOS R5 used to use the Metrowerks
// compiler), so it is not compatible to any BeOS version on that platform
// before. However, that wouldn't rule out source compatibility, which
// we do here (for now).
#define _PR2_COMPATIBLE_ 0
#define _PR3_COMPATIBLE_ 0
#define _R4_COMPATIBLE_ 0
#define _R4_5_COMPATIBLE_ 0
#elif defined(__INTEL__)
#define _PR2_COMPATIBLE_ 0
#define _PR3_COMPATIBLE_ 0
#define _R4_COMPATIBLE_ 1
#define _R4_5_COMPATIBLE_ 1
#else
# error Configure BeBuild.h for your platform
#endif
#if __MWERKS__
# define _UNUSED(x)
# define _PACKED
#endif
#if __GNUC__ #if __GNUC__
# define _UNUSED(x) x # define _UNUSED(argument) argument
# define _PACKED __attribute__((packed)) # define _PACKED __attribute__((packed))
#endif # define _PRINTFLIKE(_format_, _args_) \
__attribute__((format(__printf__, _format_, _args_)))
#if defined(__INTEL__) || defined(__POWERPC__)
// This is the standard import/export definitions used for
// the ELF binary format - this should be usable by all flavors
// of OpenBeOS.
# define _EXPORT # define _EXPORT
# define _IMPORT
# define _IMPEXP_KERNEL
# define _IMPEXP_GL
# define _IMPEXP_ROOT
# define _IMPEXP_NET
# define _IMPEXP_NETDEV
# define _IMPEXP_ATALK
# define _IMPEXP_BE
# define _IMPEXP_TRACKER
# define _IMPEXP_MAIL
# define _IMPEXP_DEVICE
# define _IMPEXP_MEDIA
# define _IMPEXP_MIDI
# define _IMPEXP_MIDI2
# define _IMPEXP_GAME
# define _IMPEXP_GSOUND
# define _IMPEXP_TRANSLATION
# define _IMPEXP_TEXTENCODING
# define _IMPEXP_INPUT
#endif #endif
#ifdef __cplusplus
/* cpp kit */
// /* -- <typeinfo> */
// class _IMPEXP_ROOT bad_cast;
// class _IMPEXP_ROOT bad_typeid;
// class _IMPEXP_ROOT type_info;
//
// /* -- <exception> */
// class _IMPEXP_ROOT exception;
// class _IMPEXP_ROOT bad_exception;
//
// /* -- <new.h> */
// class _IMPEXP_ROOT bad_alloc;
//
// /* -- <mexcept.h> */
// class _IMPEXP_ROOT logic_error;
// class _IMPEXP_ROOT domain_error;
// class _IMPEXP_ROOT invalid_argument;
// class _IMPEXP_ROOT length_error;
// class _IMPEXP_ROOT out_of_range;
// class _IMPEXP_ROOT runtime_error;
// class _IMPEXP_ROOT range_error;
// class _IMPEXP_ROOT overflow_error;
/* support kit */
class _IMPEXP_BE BArchivable;
class _IMPEXP_BE BAutolock;
class _IMPEXP_BE BBlockCache;
class _IMPEXP_BE BBufferIO;
class _IMPEXP_BE BDataIO;
class _IMPEXP_BE BPositionIO;
class _IMPEXP_BE BMallocIO;
class _IMPEXP_BE BMemoryIO;
class _IMPEXP_BE BFlattenable;
class _IMPEXP_BE BList;
class _IMPEXP_BE BLocker;
class _IMPEXP_BE BStopWatch;
class _IMPEXP_BE BString;
class _IMPEXP_BE PointerList;
/*storage kit */
struct _IMPEXP_BE entry_ref;
struct _IMPEXP_BE node_ref;
class _IMPEXP_BE BAppFileInfo;
class _IMPEXP_BE BDirectory;
class _IMPEXP_BE BEntry;
class _IMPEXP_BE BFile;
class _IMPEXP_BE BRefFilter;
class _IMPEXP_BE BMimeType;
class _IMPEXP_BE BNode;
class _IMPEXP_BE BNodeInfo;
class _IMPEXP_BE BPath;
class _IMPEXP_BE BQuery;
class _IMPEXP_BE BResources;
class _IMPEXP_BE BResourceStrings;
class _IMPEXP_BE BStatable;
class _IMPEXP_BE BSymLink;
class _IMPEXP_BE BVolume;
class _IMPEXP_BE BVolumeRoster;
//class _IMPEXP_BE Partition;
//class _IMPEXP_BE Session;
//class _IMPEXP_BE Device;
//class _IMPEXP_BE DeviceList;
//class _IMPEXP_BE TNodeWalker;
//class _IMPEXP_BE TQueryWalker;
//class _IMPEXP_BE TVolWalker;
/*app kit */
struct _IMPEXP_BE app_info;
class _IMPEXP_BE BApplication;
class _IMPEXP_BE BClipboard;
class _IMPEXP_BE BHandler;
class _IMPEXP_BE BInvoker;
class _IMPEXP_BE BLooper;
class _IMPEXP_BE BMessage;
class _IMPEXP_BE BMessageFilter;
class _IMPEXP_BE BMessageQueue;
class _IMPEXP_BE BMessageRunner;
class _IMPEXP_BE BMessenger;
class _IMPEXP_BE BPropertyInfo;
class _IMPEXP_BE BRoster;
class _IMPEXP_BE _BAppServerLink_;
class _IMPEXP_BE _BSession_;
/*interface kit */
class _IMPEXP_BE BAlert;
class _IMPEXP_BE BBitmap;
class _IMPEXP_BE BBox;
class _IMPEXP_BE BButton;
class _IMPEXP_BE BChannelControl;
class _IMPEXP_BE BChannelSlider;
class _IMPEXP_BE BCheckBox;
class _IMPEXP_BE BColorControl;
class _IMPEXP_BE BControl;
class _IMPEXP_BE BDeskbar;
class _IMPEXP_BE BDragger;
class _IMPEXP_BE BFont;
class _IMPEXP_BE BInputDevice;
class _IMPEXP_BE BListItem;
class _IMPEXP_BE BListView;
class _IMPEXP_BE BStringItem;
class _IMPEXP_BE BMenu;
class _IMPEXP_BE BMenuBar;
class _IMPEXP_BE BMenuField;
class _IMPEXP_BE BMenuItem;
class _IMPEXP_BE BOptionControl;
class _IMPEXP_BE BOptionPopUp;
class _IMPEXP_BE BOutlineListView;
class _IMPEXP_BE BPicture;
class _IMPEXP_BE BPictureButton;
class _IMPEXP_BE BPoint;
class _IMPEXP_BE BPolygon;
class _IMPEXP_BE BPopUpMenu;
class _IMPEXP_BE BPrintJob;
class _IMPEXP_BE BRadioButton;
class _IMPEXP_BE BRect;
class _IMPEXP_BE BRegion;
class _IMPEXP_BE BScreen;
class _IMPEXP_BE BScrollBar;
class _IMPEXP_BE BScrollView;
class _IMPEXP_BE BSeparatorItem;
class _IMPEXP_BE BShelf;
class _IMPEXP_BE BShape;
class _IMPEXP_BE BShapeIterator;
class _IMPEXP_BE BSlider;
class _IMPEXP_BE BStatusBar;
class _IMPEXP_BE BStringView;
class _IMPEXP_BE BTab;
class _IMPEXP_BE BTabView;
class _IMPEXP_BE BTextControl;
class _IMPEXP_BE BTextView;
class _IMPEXP_BE BView;
class _IMPEXP_BE BWindow;
class _IMPEXP_BE _BTextInput_;
class _IMPEXP_BE _BMCMenuBar_;
class _IMPEXP_BE _BMCItem_;
class _IMPEXP_BE _BWidthBuffer_;
//class _IMPEXP_BE BPrivateScreen;
/* net kit */
class _IMPEXP_NET _Allocator;
class _IMPEXP_NET _Transacter;
class _IMPEXP_NET _FastIPC;
/* netdev kit */
class _IMPEXP_NETDEV BNetPacket;
class _IMPEXP_NETDEV BStandardPacket;
class _IMPEXP_NETDEV BTimeoutHandler;
class _IMPEXP_NETDEV BPacketHandler;
class _IMPEXP_NETDEV BNetProtocol;
class _IMPEXP_NETDEV BNetDevice;
class _IMPEXP_NETDEV BCallBackHandler;
class _IMPEXP_NETDEV BNetConfig;
class _IMPEXP_NETDEV BIpDevice;
class _IMPEXP_NETDEV _NetBufList;
class _IMPEXP_NETDEV _BSem;
/* atalk kit */
class _IMPEXP_ATALK _PrinterNode;
/* tracker kit */
class _IMPEXP_TRACKER BFilePanel;
class _IMPEXP_TRACKER BRecentItemsList;
class _IMPEXP_TRACKER BRecentFilesList;
class _IMPEXP_TRACKER BRecentFoldersList;
class _IMPEXP_TRACKER BRecentAppsList;
/* mail kit */
class _IMPEXP_MAIL BMailMessage;
/* device kit */
class _IMPEXP_DEVICE BA2D;
class _IMPEXP_DEVICE BD2A;
class _IMPEXP_DEVICE BDigitalPort;
class _IMPEXP_DEVICE BJoystick;
class _IMPEXP_DEVICE BSerialPort;
/* media kit */
class _IMPEXP_MEDIA BDACRenderer;
class _IMPEXP_MEDIA BAudioFileStream;
class _IMPEXP_MEDIA BADCStream;
class _IMPEXP_MEDIA BDACStream;
class _IMPEXP_MEDIA BAbstractBufferStream;
class _IMPEXP_MEDIA BBufferStreamManager;
class _IMPEXP_MEDIA BBufferStream;
class _IMPEXP_MEDIA BSoundFile;
class _IMPEXP_MEDIA BSubscriber;
class _IMPEXP_MEDIA BMediaRoster;
class _IMPEXP_MEDIA BMediaNode;
class _IMPEXP_MEDIA BTimeSource;
class _IMPEXP_MEDIA BBufferProducer;
class _IMPEXP_MEDIA BBufferConsumer;
class _IMPEXP_MEDIA BBuffer;
class _IMPEXP_MEDIA BBufferGroup;
class _IMPEXP_MEDIA BControllable;
class _IMPEXP_MEDIA BFileInterface;
class _IMPEXP_MEDIA BEntityInterface;
class _IMPEXP_MEDIA BMediaAddOn;
class _IMPEXP_MEDIA BMediaTheme;
class _IMPEXP_MEDIA BParameterWeb;
class _IMPEXP_MEDIA BParameterGroup;
class _IMPEXP_MEDIA BParameter;
class _IMPEXP_MEDIA BNullParameter;
class _IMPEXP_MEDIA BDiscreteParameter;
class _IMPEXP_MEDIA BContinuousParameter;
class _IMPEXP_MEDIA BMediaFiles;
class _IMPEXP_MEDIA BSound;
class _IMPEXP_MEDIA BSoundCard;
class _IMPEXP_MEDIA BSoundPlayer;
class _IMPEXP_MEDIA BMediaFormats;
class _IMPEXP_MEDIA BTimedEventQueue;
//class _IMPEXP_MEDIA BEventIterator;
class _IMPEXP_MEDIA BMediaEventLooper;
class _IMPEXP_MEDIA BMediaFile;
class _IMPEXP_MEDIA BMediaTrack;
class _IMPEXP_MEDIA media_node;
struct _IMPEXP_MEDIA media_input;
struct _IMPEXP_MEDIA media_output;
struct _IMPEXP_MEDIA live_node_info;
struct _IMPEXP_MEDIA buffer_clone_info;
struct _IMPEXP_MEDIA media_source;
struct _IMPEXP_MEDIA media_destination;
struct _IMPEXP_MEDIA media_raw_audio_format;
struct _IMPEXP_MEDIA media_raw_video_format;
struct _IMPEXP_MEDIA media_video_display_info;
struct _IMPEXP_MEDIA flavor_info;
struct _IMPEXP_MEDIA dormant_node_info;
struct _IMPEXP_MEDIA dormant_flavor_info;
struct _IMPEXP_MEDIA media_source;
struct _IMPEXP_MEDIA media_destination;
struct _IMPEXP_MEDIA _media_format_description;
struct _IMPEXP_MEDIA media_timed_event;
/* midi kit */
class _IMPEXP_MIDI BMidi;
class _IMPEXP_MIDI BMidiPort;
class _IMPEXP_MIDI BMidiStore;
class _IMPEXP_MIDI BMidiSynth;
class _IMPEXP_MIDI BMidiSynthFile;
class _IMPEXP_MIDI BMidiText;
class _IMPEXP_MIDI BSamples;
class _IMPEXP_MIDI BSynth;
class _IMPEXP_MIDI2 BMidiEndpoint;
class _IMPEXP_MIDI2 BMidiProducer;
class _IMPEXP_MIDI2 BMidiConsumer;
class _IMPEXP_MIDI2 BMidiLocalProducer;
class _IMPEXP_MIDI2 BMidiLocalConsumer;
class _IMPEXP_MIDI2 BMidiRoster;
/* game kit */
class _IMPEXP_GAME BWindowScreen;
class _IMPEXP_GAME BDirectWindow;
/* gamesound kit */
class _IMPEXP_GSOUND BGameSound;
class _IMPEXP_GSOUND BSimpleGameSound;
class _IMPEXP_GSOUND BStreamingGameSound;
class _IMPEXP_GSOUND BFileGameSound;
class _IMPEXP_GSOUND BPushGameSound;
/* translation kit */
class _IMPEXP_TRANSLATION BTranslatorRoster;
class _IMPEXP_TRANSLATION BTranslationUtils;
class _IMPEXP_TRANSLATION BBitmapStream;
class _IMPEXP_TRANSLATION BTranslator;
struct _IMPEXP_TRANSLATION translation_format;
struct _IMPEXP_TRANSLATION translator_info;
/* GL */
class _IMPEXP_GL BGLView;
class _IMPEXP_GL BGLScreen;
class _IMPEXP_GL GLUnurbs;
class _IMPEXP_GL GLUquadric;
class _IMPEXP_GL GLUtesselator;
typedef class _IMPEXP_GL GLUnurbs GLUnurbsObj;
typedef class _IMPEXP_GL GLUquadric GLUquadricObj;
typedef class _IMPEXP_GL GLUtesselator GLUtesselatorObj;
typedef class _IMPEXP_GL GLUtesselator GLUtriangulatorObj;
/* input_server */
class _IMPEXP_INPUT BInputServerDevice;
class _IMPEXP_INPUT BInputServerFilter;
class _IMPEXP_INPUT BInputServerMethod;
#else /* __cplusplus */
/*
//typedef struct _IMPEXP_GL GLUnurbs GLUnurbs;
//typedef struct _IMPEXP_GL GLUquadric GLUquadric;
//typedef struct _IMPEXP_GL GLUtesselator GLUtesselator;
//typedef struct _IMPEXP_GL GLUnurbs GLUnurbsObj;
//typedef struct _IMPEXP_GL GLUquadric GLUquadricObj;
//typedef struct _IMPEXP_GL GLUtesselator GLUtesselatorObj;
//typedef struct _IMPEXP_GL GLUtesselator GLUtriangulatorObj;
*/
#endif /* __cplusplus */
#endif /* _BE_BUILD_H */ #endif /* _BE_BUILD_H */
headers/os/add-ons/graphics/GraphicsCard.h
+1 -1
View File
@@ -147,7 +147,7 @@ typedef void (*graphics_card_hook) ();
extern "C" { extern "C" {
#endif #endif
_EXPORT int32 control_graphics_card(uint32, void*); int32 control_graphics_card(uint32, void*);
#ifdef __cplusplus #ifdef __cplusplus
} }
headers/os/add-ons/input_server/InputServerFilter.h
+1
View File
@@ -15,6 +15,7 @@
#include <MessageFilter.h> #include <MessageFilter.h>
#include <SupportDefs.h> #include <SupportDefs.h>
class BRegion;
class BInputServerFilter { class BInputServerFilter {
public: public:
headers/os/add-ons/input_server/InputServerMethod.h
+1
View File
@@ -18,6 +18,7 @@
class _BMethodAddOn_; class _BMethodAddOn_;
class AddOnManager; class AddOnManager;
class BMenu;
class InputServer; class InputServer;
class BInputServerMethod : public BInputServerFilter { class BInputServerMethod : public BInputServerFilter {
headers/os/app/Application.h
+7 -5
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2006, Haiku. * Copyright 2001-2007, Haiku.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -20,10 +20,12 @@
class BCursor; class BCursor;
class BList; class BList;
class BWindow; class BLocker;
class BResources;
class BMessageRunner; class BMessageRunner;
class BResources;
class BServer; class BServer;
class BWindow;
struct app_info;
namespace BPrivate { namespace BPrivate {
class PortLink; class PortLink;
@@ -163,7 +165,7 @@ private:
// Global Objects // Global Objects
extern _IMPEXP_BE BApplication* be_app; extern BApplication* be_app;
extern _IMPEXP_BE BMessenger be_app_messenger; extern BMessenger be_app_messenger;
#endif // _APPLICATION_H #endif // _APPLICATION_H
headers/os/app/Handler.h
+1
View File
@@ -16,6 +16,7 @@
class BLooper; class BLooper;
class BMessageFilter; class BMessageFilter;
class BMessage; class BMessage;
class BMessenger;
class BList; class BList;
#define B_OBSERVE_WHAT_CHANGE "be:observe_change_what" #define B_OBSERVE_WHAT_CHANGE "be:observe_change_what"
headers/os/app/Roster.h
+3
View File
@@ -13,6 +13,9 @@
#include <Messenger.h> #include <Messenger.h>
#include <OS.h> #include <OS.h>
class BMimeType;
class BNodeInfo;
struct app_info { struct app_info {
app_info(); app_info();
headers/os/device/Joystick.h
+3 -3
View File
@@ -17,8 +17,10 @@
#include <OS.h> #include <OS.h>
class BList; class BList;
class BString;
struct entry_ref;
struct _extended_joystick; struct _extended_joystick;
class _IMPEXP_DEVICE _BJoystickTweaker; class _BJoystickTweaker;
/* -----------------------------------------------------------------------*/ /* -----------------------------------------------------------------------*/
class BJoystick { class BJoystick {
@@ -107,12 +109,10 @@ virtual void _ReservedJoystick3();
BList * _fDevices; BList * _fDevices;
_joystick_info * m_info; _joystick_info * m_info;
char * m_dev_name; char * m_dev_name;
#if !_PR3_COMPATIBLE_
virtual status_t _Reserved_Joystick_4(void *, ...); virtual status_t _Reserved_Joystick_4(void *, ...);
virtual status_t _Reserved_Joystick_5(void *, ...); virtual status_t _Reserved_Joystick_5(void *, ...);
virtual status_t _Reserved_Joystick_6(void *, ...); virtual status_t _Reserved_Joystick_6(void *, ...);
uint32 _reserved_Joystick_[10]; uint32 _reserved_Joystick_[10];
#endif
}; };
#endif #endif
headers/os/game/FileGameSound.h
+4 -15
View File
@@ -23,28 +23,18 @@
// Author: Christopher ML Zumwalt May ([email protected]) // Author: Christopher ML Zumwalt May ([email protected])
// Description: BFileGameSound is a class that streams data out of a file. // Description: BFileGameSound is a class that streams data out of a file.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#ifndef _FILEGAMESOUND_H #ifndef _FILEGAMESOUND_H
#define _FILEGAMESOUND_H #define _FILEGAMESOUND_H
// Standard Includes -----------------------------------------------------------
// System Includes -------------------------------------------------------------
#include <StreamingGameSound.h> #include <StreamingGameSound.h>
// Project Includes ------------------------------------------------------------ struct entry_ref;
// Local Includes --------------------------------------------------------------
// Local Defines ---------------------------------------------------------------
// Globals ---------------------------------------------------------------------
struct _gs_media_tracker; struct _gs_media_tracker;
struct _gs_ramp; struct _gs_ramp;
// FileGameSound -------------------------------------------------------------
class BFileGameSound : public BStreamingGameSound class BFileGameSound : public BStreamingGameSound {
{
public: public:
BFileGameSound(const entry_ref * file, BFileGameSound(const entry_ref * file,
bool looping = true, bool looping = true,
@@ -74,7 +64,6 @@ public:
int32 IsPaused(); int32 IsPaused();
private: private:
_gs_media_tracker * fAudioStream; _gs_media_tracker * fAudioStream;
bool fStopping; bool fStopping;
@@ -133,4 +122,4 @@ virtual status_t _Reserved_BFileGameSound_22(int32 arg, ...);
virtual status_t _Reserved_BFileGameSound_23(int32 arg, ...); virtual status_t _Reserved_BFileGameSound_23(int32 arg, ...);
}; };
#endif #endif // _FILEGAMESOUND_H
headers/os/interface/Deskbar.h
+2 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2006, Haiku, Inc. All Rights Reserved. * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _DESKBAR_H #ifndef _DESKBAR_H
@@ -11,6 +11,7 @@
class BMessenger; class BMessenger;
class BView; class BView;
struct entry_ref;
enum deskbar_location { enum deskbar_location {
headers/os/interface/Dragger.h
+2 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2006, Haiku, Inc. All Rights Reserved. * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _DRAGGER_H #ifndef _DRAGGER_H
@@ -12,6 +12,7 @@
class BBitmap; class BBitmap;
class BMessage; class BMessage;
class BPopUpMenu;
class BShelf; class BShelf;
namespace BPrivate { namespace BPrivate {
headers/os/interface/Font.h
+3 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2005, Haiku, Inc. All Rights Reserved. * Copyright 2005-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _FONT_H_ #ifndef _FONT_H_
@@ -9,6 +9,8 @@
#include <SupportDefs.h> #include <SupportDefs.h>
#include <InterfaceDefs.h> #include <InterfaceDefs.h>
class BPoint;
#define B_FONT_FAMILY_LENGTH 63 #define B_FONT_FAMILY_LENGTH 63
#define B_FONT_STYLE_LENGTH 63 #define B_FONT_STYLE_LENGTH 63
headers/os/interface/GraphicsDefs.h
+14 -14
View File
@@ -65,9 +65,9 @@ operator!=(const pattern& a, const pattern& b)
#endif // __cplusplus #endif // __cplusplus
extern _IMPEXP_BE const pattern B_SOLID_HIGH; extern const pattern B_SOLID_HIGH;
extern _IMPEXP_BE const pattern B_MIXED_COLORS; extern const pattern B_MIXED_COLORS;
extern _IMPEXP_BE const pattern B_SOLID_LOW; extern const pattern B_SOLID_LOW;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -115,15 +115,15 @@ make_color(uint8 red, uint8 green, uint8 blue, uint8 alpha = 255)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
extern _IMPEXP_BE const rgb_color B_TRANSPARENT_COLOR; extern const rgb_color B_TRANSPARENT_COLOR;
extern _IMPEXP_BE const uint8 B_TRANSPARENT_MAGIC_CMAP8; extern const uint8 B_TRANSPARENT_MAGIC_CMAP8;
extern _IMPEXP_BE const uint16 B_TRANSPARENT_MAGIC_RGBA15; extern const uint16 B_TRANSPARENT_MAGIC_RGBA15;
extern _IMPEXP_BE const uint16 B_TRANSPARENT_MAGIC_RGBA15_BIG; extern const uint16 B_TRANSPARENT_MAGIC_RGBA15_BIG;
extern _IMPEXP_BE const uint32 B_TRANSPARENT_MAGIC_RGBA32; extern const uint32 B_TRANSPARENT_MAGIC_RGBA32;
extern _IMPEXP_BE const uint32 B_TRANSPARENT_MAGIC_RGBA32_BIG; extern const uint32 B_TRANSPARENT_MAGIC_RGBA32_BIG;
extern _IMPEXP_BE const uint8 B_TRANSPARENT_8_BIT; extern const uint8 B_TRANSPARENT_8_BIT;
extern _IMPEXP_BE const rgb_color B_TRANSPARENT_32_BIT; extern const rgb_color B_TRANSPARENT_32_BIT;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -160,7 +160,7 @@ typedef struct overlay_restrictions {
struct screen_id { int32 id; }; struct screen_id { int32 id; };
extern _IMPEXP_BE const struct screen_id B_MAIN_SCREEN_ID; extern const struct screen_id B_MAIN_SCREEN_ID;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -272,7 +272,7 @@ enum {
B_VIEWS_SUPPORT_DRAW_BITMAP = 0x1, B_VIEWS_SUPPORT_DRAW_BITMAP = 0x1,
B_BITMAPS_SUPPORT_ATTACHED_VIEWS = 0x2 B_BITMAPS_SUPPORT_ATTACHED_VIEWS = 0x2
}; };
_IMPEXP_BE bool bitmaps_support_space(color_space space, uint32 * support_flags); bool bitmaps_support_space(color_space space, uint32 * support_flags);
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// "pixel_chunk" is the native increment from one pixel starting on an integral byte // "pixel_chunk" is the native increment from one pixel starting on an integral byte
@@ -281,7 +281,7 @@ _IMPEXP_BE bool bitmaps_support_space(color_space space, uint32 * support_flags)
// sets pixel_chunk to 1, row_alignment to 4 and pixels_per_chunk to 8, whereas // sets pixel_chunk to 1, row_alignment to 4 and pixels_per_chunk to 8, whereas
// B_RGB24 sets pixel_chunk to 3, row_alignment to 4 and pixels_per_chunk to 1. // B_RGB24 sets pixel_chunk to 3, row_alignment to 4 and pixels_per_chunk to 1.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
_IMPEXP_BE status_t get_pixel_size_for(color_space space, size_t * pixel_chunk, status_t get_pixel_size_for(color_space space, size_t * pixel_chunk,
size_t * row_alignment, size_t * pixels_per_chunk); size_t * row_alignment, size_t * pixels_per_chunk);
headers/os/interface/Input.h
+5 -3
View File
@@ -15,6 +15,8 @@
#include <Messenger.h> #include <Messenger.h>
#include <SupportDefs.h> #include <SupportDefs.h>
class BList;
enum input_method_op { enum input_method_op {
B_INPUT_METHOD_STARTED = 0, B_INPUT_METHOD_STARTED = 0,
@@ -47,9 +49,9 @@ enum input_device_notification {
class BInputDevice; class BInputDevice;
_IMPEXP_BE BInputDevice* find_input_device(const char *name); BInputDevice* find_input_device(const char *name);
_IMPEXP_BE status_t get_input_devices(BList *list); status_t get_input_devices(BList *list);
_IMPEXP_BE status_t watch_input_devices(BMessenger target, bool start); status_t watch_input_devices(BMessenger target, bool start);
class BInputDevice { class BInputDevice {
headers/os/interface/InterfaceDefs.h
+42 -42
View File
@@ -251,54 +251,54 @@ enum overlay_options {
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
_IMPEXP_BE status_t get_deskbar_frame(BRect *frame); status_t get_deskbar_frame(BRect *frame);
_IMPEXP_BE const color_map *system_colors(); const color_map *system_colors();
_IMPEXP_BE status_t set_screen_space(int32 index, uint32 res, status_t set_screen_space(int32 index, uint32 res,
bool stick = true); bool stick = true);
_IMPEXP_BE status_t get_scroll_bar_info(scroll_bar_info *info); status_t get_scroll_bar_info(scroll_bar_info *info);
_IMPEXP_BE status_t set_scroll_bar_info(scroll_bar_info *info); status_t set_scroll_bar_info(scroll_bar_info *info);
_IMPEXP_BE status_t get_mouse_type(int32 *type); status_t get_mouse_type(int32 *type);
_IMPEXP_BE status_t set_mouse_type(int32 type); status_t set_mouse_type(int32 type);
_IMPEXP_BE status_t get_mouse_map(mouse_map *map); status_t get_mouse_map(mouse_map *map);
_IMPEXP_BE status_t set_mouse_map(mouse_map *map); status_t set_mouse_map(mouse_map *map);
_IMPEXP_BE status_t get_click_speed(bigtime_t *speed); status_t get_click_speed(bigtime_t *speed);
_IMPEXP_BE status_t set_click_speed(bigtime_t speed); status_t set_click_speed(bigtime_t speed);
_IMPEXP_BE status_t get_mouse_speed(int32 *speed); status_t get_mouse_speed(int32 *speed);
_IMPEXP_BE status_t set_mouse_speed(int32 speed); status_t set_mouse_speed(int32 speed);
_IMPEXP_BE status_t get_mouse_acceleration(int32 *speed); status_t get_mouse_acceleration(int32 *speed);
_IMPEXP_BE status_t set_mouse_acceleration(int32 speed); status_t set_mouse_acceleration(int32 speed);
_IMPEXP_BE status_t get_key_repeat_rate(int32 *rate); status_t get_key_repeat_rate(int32 *rate);
_IMPEXP_BE status_t set_key_repeat_rate(int32 rate); status_t set_key_repeat_rate(int32 rate);
_IMPEXP_BE status_t get_key_repeat_delay(bigtime_t *delay); status_t get_key_repeat_delay(bigtime_t *delay);
_IMPEXP_BE status_t set_key_repeat_delay(bigtime_t delay); status_t set_key_repeat_delay(bigtime_t delay);
_IMPEXP_BE uint32 modifiers(); uint32 modifiers();
_IMPEXP_BE status_t get_key_info(key_info *info); status_t get_key_info(key_info *info);
_IMPEXP_BE void get_key_map(key_map **map, char **key_buffer); void get_key_map(key_map **map, char **key_buffer);
_IMPEXP_BE status_t get_keyboard_id(uint16 *id); status_t get_keyboard_id(uint16 *id);
_IMPEXP_BE void set_modifier_key(uint32 modifier, uint32 key); void set_modifier_key(uint32 modifier, uint32 key);
_IMPEXP_BE void set_keyboard_locks(uint32 modifiers); void set_keyboard_locks(uint32 modifiers);
_IMPEXP_BE rgb_color keyboard_navigation_color(); rgb_color keyboard_navigation_color();
_IMPEXP_BE int32 count_workspaces(); int32 count_workspaces();
_IMPEXP_BE void set_workspace_count(int32 count); void set_workspace_count(int32 count);
_IMPEXP_BE int32 current_workspace(); int32 current_workspace();
_IMPEXP_BE void activate_workspace(int32 workspace); void activate_workspace(int32 workspace);
_IMPEXP_BE bigtime_t idle_time(); bigtime_t idle_time();
_IMPEXP_BE void run_select_printer_panel(); void run_select_printer_panel();
_IMPEXP_BE void run_add_printer_panel(); void run_add_printer_panel();
_IMPEXP_BE void run_be_about(); void run_be_about();
_IMPEXP_BE void set_focus_follows_mouse(bool follow); void set_focus_follows_mouse(bool follow);
_IMPEXP_BE bool focus_follows_mouse(); bool focus_follows_mouse();
enum mode_mouse { enum mode_mouse {
B_NORMAL_MOUSE = 0, B_NORMAL_MOUSE = 0,
@@ -307,8 +307,8 @@ enum mode_mouse {
B_INSTANT_WARP_MOUSE = 7 B_INSTANT_WARP_MOUSE = 7
}; };
_IMPEXP_BE void set_mouse_mode(mode_mouse mode); void set_mouse_mode(mode_mouse mode);
_IMPEXP_BE mode_mouse mouse_mode(); mode_mouse mouse_mode();
enum color_which { enum color_which {
B_PANEL_BACKGROUND_COLOR = 1, B_PANEL_BACKGROUND_COLOR = 1,
@@ -350,10 +350,10 @@ enum color_which {
B_WINDOW_INACTIVE_TEXT_COLOR = 24 B_WINDOW_INACTIVE_TEXT_COLOR = 24
}; };
_IMPEXP_BE rgb_color ui_color(color_which which); rgb_color ui_color(color_which which);
_IMPEXP_BE void set_ui_color(const color_which &which, void set_ui_color(const color_which &which,
const rgb_color &color); const rgb_color &color);
_IMPEXP_BE rgb_color tint_color(rgb_color color, float tint); rgb_color tint_color(rgb_color color, float tint);
extern "C" status_t _init_interface_kit_(); extern "C" status_t _init_interface_kit_();
/* effects on standard gray level */ /* effects on standard gray level */
headers/os/interface/ListItem.h
+2 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2006, Haiku, Inc. All Rights Reserved. * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _LIST_ITEM_H #ifndef _LIST_ITEM_H
@@ -10,6 +10,7 @@
#include <Rect.h> #include <Rect.h>
class BFont; class BFont;
class BList;
class BMessage; class BMessage;
class BOutlineListView; class BOutlineListView;
class BView; class BView;
headers/os/interface/Menu.h
+2 -1
View File
@@ -10,8 +10,9 @@
#include <List.h> #include <List.h>
#include <View.h> #include <View.h>
class BMenuItem; class BMenu;
class BMenuBar; class BMenuBar;
class BMenuItem;
namespace BPrivate { namespace BPrivate {
headers/os/interface/Picture.h
+1 -1
View File
@@ -33,7 +33,7 @@
#include <Rect.h> #include <Rect.h>
#include <Archivable.h> #include <Archivable.h>
class BDataIO;
class BView; class BView;
struct _BPictureExtent_; struct _BPictureExtent_;
headers/os/interface/PrintJob.h
+1
View File
@@ -15,6 +15,7 @@
#include <Picture.h> /* For convenience */ #include <Picture.h> /* For convenience */
#include <Rect.h> #include <Rect.h>
class BFile;
class BView; class BView;
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
headers/os/interface/Screen.h
+1
View File
@@ -12,6 +12,7 @@
#include <OS.h> #include <OS.h>
class BBitmap;
class BWindow; class BWindow;
namespace BPrivate { namespace BPrivate {
headers/os/interface/Shape.h
+47 -53
View File
@@ -1,96 +1,90 @@
/* /*
* Copyright 2006, Haiku, Inc. All Rights Reserved. * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SHAPE_H #ifndef _SHAPE_H
#define _SHAPE_H #define _SHAPE_H
#include <BeBuild.h> #include <BeBuild.h>
#include <Archivable.h> #include <Archivable.h>
class BPoint;
class BRect;
class BShape;
namespace BPrivate { namespace BPrivate {
class ServerLink; class ServerLink;
class PicturePlayer; class PicturePlayer;
}; };
/*----------------------------------------------------------------*/
/*----- BShapeIterator class -------------------------------------*/
class BShapeIterator { class BShapeIterator {
public: public:
BShapeIterator(); BShapeIterator();
virtual ~BShapeIterator(); virtual ~BShapeIterator();
virtual status_t IterateMoveTo(BPoint *point); virtual status_t IterateMoveTo(BPoint *point);
virtual status_t IterateLineTo(int32 lineCount, BPoint *linePts); virtual status_t IterateLineTo(int32 lineCount, BPoint *linePts);
virtual status_t IterateBezierTo(int32 bezierCount, BPoint *bezierPts); virtual status_t IterateBezierTo(int32 bezierCount, BPoint *bezierPts);
virtual status_t IterateClose(); virtual status_t IterateClose();
status_t Iterate(BShape *shape); status_t Iterate(BShape *shape);
private: private:
virtual void _ReservedShapeIterator1();
virtual void _ReservedShapeIterator2();
virtual void _ReservedShapeIterator3();
virtual void _ReservedShapeIterator4();
virtual void _ReservedShapeIterator1(); uint32 reserved[4];
virtual void _ReservedShapeIterator2();
virtual void _ReservedShapeIterator3();
virtual void _ReservedShapeIterator4();
uint32 reserved[4];
}; };
/*----------------------------------------------------------------*/
/*----- BShape class ---------------------------------------------*/
class BShape : public BArchivable { class BShape : public BArchivable {
public: public:
BShape(); BShape();
BShape(const BShape &copyFrom); BShape(const BShape &copyFrom);
BShape(BMessage *data); BShape(BMessage *data);
virtual ~BShape(); virtual ~BShape();
virtual status_t Archive(BMessage *into, bool deep = true) const; virtual status_t Archive(BMessage *into, bool deep = true) const;
static BArchivable *Instantiate(BMessage *data); static BArchivable *Instantiate(BMessage *data);
void Clear(); void Clear();
BRect Bounds() const; BRect Bounds() const;
status_t AddShape(const BShape *other); status_t AddShape(const BShape *other);
status_t MoveTo(BPoint point); status_t MoveTo(BPoint point);
status_t LineTo(BPoint linePoint); status_t LineTo(BPoint linePoint);
status_t BezierTo(BPoint controlPoints[3]); status_t BezierTo(BPoint controlPoints[3]);
status_t Close(); status_t Close();
/*----- Private or reserved ---------------*/
virtual status_t Perform(perform_code d, void *arg);
private: private:
virtual status_t Perform(perform_code d, void *arg);
virtual void _ReservedShape1(); virtual void _ReservedShape1();
virtual void _ReservedShape2(); virtual void _ReservedShape2();
virtual void _ReservedShape3(); virtual void _ReservedShape3();
virtual void _ReservedShape4(); virtual void _ReservedShape4();
friend class BShapeIterator; friend class BShapeIterator;
friend class BView; friend class BView;
friend class BFont; friend class BFont;
friend class BPrivate::PicturePlayer; friend class BPrivate::PicturePlayer;
friend class BPrivate::ServerLink; friend class BPrivate::ServerLink;
void GetData(int32 *opCount, int32 *ptCount, uint32 **opList, BPoint **ptList); void GetData(int32 *opCount, int32 *ptCount, uint32 **opList, BPoint **ptList);
void SetData(int32 opCount, int32 ptCount, const uint32 *opList, const BPoint *ptList); void SetData(int32 opCount, int32 ptCount, const uint32 *opList, const BPoint *ptList);
void InitData(); void InitData();
bool AllocatePts(int32 count); bool AllocatePts(int32 count);
bool AllocateOps(int32 count); bool AllocateOps(int32 count);
uint32 fState; uint32 fState;
uint32 fBuildingOp; uint32 fBuildingOp;
void * fPrivateData; void* fPrivateData;
uint32 reserved[4]; uint32 reserved[4];
}; };
#endif #endif // _SHAPE_H
headers/os/interface/Shelf.h
+2 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2006, Haiku Inc. * Copyright 2001-2007, Haiku Inc.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SHELF_H #ifndef _SHELF_H
@@ -10,6 +10,7 @@
#include <List.h> #include <List.h>
class BDataIO; class BDataIO;
class BPoint;
class BView; class BView;
class BEntry; class BEntry;
struct entry_ref; struct entry_ref;
headers/os/interface/TabView.h
-6
View File
@@ -158,11 +158,7 @@ virtual BHandler *ResolveSpecifier(BMessage *message, int32 index,
virtual status_t GetSupportedSuites(BMessage *message); virtual status_t GetSupportedSuites(BMessage *message);
virtual void AddTab(BView *target, BTab *tab = NULL); virtual void AddTab(BView *target, BTab *tab = NULL);
#if !_PR3_COMPATIBLE_
virtual BTab *RemoveTab(int32 tabIndex); virtual BTab *RemoveTab(int32 tabIndex);
#else
virtual BTab *RemoveTab(int32 tabIndex) const;
#endif
virtual BTab *TabAt ( int32 tab_index ) const; virtual BTab *TabAt ( int32 tab_index ) const;
@@ -208,6 +204,4 @@ virtual void _ReservedTabView12();
uint32 _reserved[11]; uint32 _reserved[11];
}; };
#endif // _TAB_VIEW_H #endif // _TAB_VIEW_H
headers/os/interface/TextView.h
+9 -31
View File
@@ -14,6 +14,8 @@
#include <BeBuild.h> #include <BeBuild.h>
#include <View.h> #include <View.h>
class BMessageRunner;
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
/*----- BTextView structures and definitions ---------------------*/ /*----- BTextView structures and definitions ---------------------*/
@@ -37,16 +39,6 @@ enum undo_state {
B_UNDO_DROP B_UNDO_DROP
}; };
#if _PR2_COMPATIBLE_
extern "C" void _ReservedTextView2__9BTextViewFv(BTextView *object,
BMessage *drag,
BBitmap **bitmap,
BPoint *point,
BHandler **handler);
#endif
class BBitmap; class BBitmap;
class BClipboard; class BClipboard;
class BFile; class BFile;
@@ -266,27 +258,16 @@ private:
friend status_t _init_interface_kit_(); friend status_t _init_interface_kit_();
friend class _BTextTrackState_; friend class _BTextTrackState_;
#if _PR2_COMPATIBLE_
friend void _ReservedTextView2__9BTextViewFv(BTextView *object,
BMessage *drag,
BBitmap **bitmap,
BPoint *point,
BHandler **handler);
#endif
virtual void _ReservedTextView3(); virtual void _ReservedTextView3();
virtual void _ReservedTextView4(); virtual void _ReservedTextView4();
virtual void _ReservedTextView5(); virtual void _ReservedTextView5();
virtual void _ReservedTextView6(); virtual void _ReservedTextView6();
virtual void _ReservedTextView7(); virtual void _ReservedTextView7();
virtual void _ReservedTextView8(); virtual void _ReservedTextView8();
#if !_PR3_COMPATIBLE_
virtual void _ReservedTextView9(); virtual void _ReservedTextView9();
virtual void _ReservedTextView10(); virtual void _ReservedTextView10();
virtual void _ReservedTextView11(); virtual void _ReservedTextView11();
virtual void _ReservedTextView12(); virtual void _ReservedTextView12();
#endif
void InitObject(BRect textRect, void InitObject(BRect textRect,
const BFont *initialFont, const BFont *initialFont,
@@ -423,17 +404,14 @@ static void UnlockWidthBuffer();
color_space fColorSpace; color_space fColorSpace;
bool fResizable; bool fResizable;
BView* fContainerView; BView* fContainerView;
_BUndoBuffer_* fUndo; /* was _reserved[0] */ _BUndoBuffer_* fUndo;
_BInlineInput_* fInline; /* was _reserved[1] */ _BInlineInput_* fInline;
BMessageRunner * fDragRunner; /* was _reserved[2] */ BMessageRunner * fDragRunner;
BMessageRunner * fClickRunner; /* was _reserved[3] */ BMessageRunner * fClickRunner;
BPoint fWhere; BPoint fWhere;
_BTextTrackState_* fTrackingMouse; /* was _reserved[6] */ _BTextTrackState_* fTrackingMouse;
_BTextChangeResult_* fTextChange; /* was _reserved[7] */ _BTextChangeResult_* fTextChange;
uint32 _reserved[1]; /* was 8 */ uint32 _reserved[9];
#if !_PR3_COMPATIBLE_
uint32 _more_reserved[8];
#endif
static _BWidthBuffer_* sWidths; static _BWidthBuffer_* sWidths;
static sem_id sWidthSem; static sem_id sWidthSem;
headers/os/interface/View.h
-4
View File
@@ -422,11 +422,7 @@ public:
virtual void SetFont(const BFont* font, uint32 mask = B_FONT_ALL); virtual void SetFont(const BFont* font, uint32 mask = B_FONT_ALL);
#if !_PR3_COMPATIBLE_
void GetFont(BFont* font) const; void GetFont(BFont* font) const;
#else
void GetFont(BFont* font);
#endif
void TruncateString(BString* in_out, void TruncateString(BString* in_out,
uint32 mode, uint32 mode,
float width) const; float width) const;
headers/os/kernel/image.h
+15 -15
View File
@@ -64,20 +64,20 @@ enum {
// doesn't exist. // doesn't exist.
}; };
extern _IMPEXP_ROOT thread_id load_image(int32 argc, const char **argv, extern thread_id load_image(int32 argc, const char **argv,
const char **envp); const char **envp);
extern _IMPEXP_ROOT image_id load_add_on(const char *path); extern image_id load_add_on(const char *path);
extern _IMPEXP_ROOT status_t unload_add_on(image_id imageID); extern status_t unload_add_on(image_id imageID);
/* private; use the macros, below */ /* private; use the macros, below */
extern _IMPEXP_ROOT status_t _get_image_info (image_id imageID, extern status_t _get_image_info (image_id imageID,
image_info *info, size_t size); image_info *info, size_t size);
extern _IMPEXP_ROOT status_t _get_next_image_info (team_id team, int32 *cookie, extern status_t _get_next_image_info (team_id team, int32 *cookie,
image_info *info, size_t size); image_info *info, size_t size);
/* use these */ /* use these */
#define get_image_info(image, info) \ #define get_image_info(image, info) \
_get_image_info((image), (info), sizeof(*(info))) _get_image_info((image), (info), sizeof(*(info)))
#define get_next_image_info(team, cookie, info) \ #define get_next_image_info(team, cookie, info) \
_get_next_image_info((team), (cookie), (info), sizeof(*(info))) _get_next_image_info((team), (cookie), (info), sizeof(*(info)))
@@ -88,11 +88,11 @@ extern _IMPEXP_ROOT status_t _get_next_image_info (team_id team, int32 *cookie,
#define B_SYMBOL_TYPE_TEXT 0x2 #define B_SYMBOL_TYPE_TEXT 0x2
#define B_SYMBOL_TYPE_ANY 0x5 #define B_SYMBOL_TYPE_ANY 0x5
extern _IMPEXP_ROOT status_t get_image_symbol(image_id imid, extern status_t get_image_symbol(image_id imid,
const char *name, int32 sclass, void **ptr); const char *name, int32 sclass, void **ptr);
extern _IMPEXP_ROOT status_t get_nth_image_symbol(image_id imid, int32 index, extern status_t get_nth_image_symbol(image_id imid, int32 index,
char *buf, int32 *bufsize, int32 *sclass, char *buf, int32 *bufsize, int32 *sclass,
void **ptr); void **ptr);
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
@@ -103,7 +103,7 @@ extern _IMPEXP_ROOT status_t get_nth_image_symbol(image_id imid, int32 index,
#define B_INVALIDATE_DCACHE 0x0002 #define B_INVALIDATE_DCACHE 0x0002
#define B_INVALIDATE_ICACHE 0x0008 #define B_INVALIDATE_ICACHE 0x0008
extern _IMPEXP_ROOT void clear_caches(void *addr, size_t len, uint32 flags); extern void clear_caches(void *addr, size_t len, uint32 flags);
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
headers/os/kernel/scheduler.h
+4 -4
View File
@@ -41,13 +41,13 @@ enum be_task_flags { /* bitmasks for "what" */
}; };
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
_IMPEXP_ROOT int32 suggest_thread_priority(uint32 task_flags = B_DEFAULT_MEDIA_PRIORITY, int32 suggest_thread_priority(uint32 task_flags = B_DEFAULT_MEDIA_PRIORITY,
int32 period = 0, bigtime_t jitter = 0, bigtime_t length = 0); int32 period = 0, bigtime_t jitter = 0, bigtime_t length = 0);
_IMPEXP_ROOT bigtime_t estimate_max_scheduling_latency(thread_id th = -1); /* default is current thread */ bigtime_t estimate_max_scheduling_latency(thread_id th = -1); /* default is current thread */
} }
#else #else
_IMPEXP_ROOT int32 suggest_thread_priority(uint32 what, int32 period, bigtime_t jitter, bigtime_t length); int32 suggest_thread_priority(uint32 what, int32 period, bigtime_t jitter, bigtime_t length);
_IMPEXP_ROOT bigtime_t estimate_max_scheduling_latency(thread_id th); /* default is current thread */ bigtime_t estimate_max_scheduling_latency(thread_id th); /* default is current thread */
#endif #endif
#endif /* SCHEDULER_H */ #endif /* SCHEDULER_H */
headers/os/mail/E-mail.h
+13 -12
View File
@@ -14,6 +14,7 @@
#include <UTF8.h> #include <UTF8.h>
class BList; class BList;
struct entry_ref;
/* -----------------------------------------------------------------------*/ /* -----------------------------------------------------------------------*/
/* 'E-Mail' attributes...*/ /* 'E-Mail' attributes...*/
@@ -94,22 +95,22 @@ typedef struct {
/* -----------------------------------------------------------------------*/ /* -----------------------------------------------------------------------*/
/* global functions...*/ /* global functions...*/
_IMPEXP_MAIL int32 count_pop_accounts(void); int32 count_pop_accounts(void);
_IMPEXP_MAIL status_t get_pop_account(mail_pop_account*, int32 index = 0); status_t get_pop_account(mail_pop_account*, int32 index = 0);
_IMPEXP_MAIL status_t set_pop_account(mail_pop_account*, int32 index = 0, status_t set_pop_account(mail_pop_account*, int32 index = 0,
bool save = true); bool save = true);
_IMPEXP_MAIL status_t get_smtp_host(char*); status_t get_smtp_host(char*);
_IMPEXP_MAIL status_t set_smtp_host(char*, bool save = true); status_t set_smtp_host(char*, bool save = true);
_IMPEXP_MAIL status_t get_mail_notification(mail_notification*); status_t get_mail_notification(mail_notification*);
_IMPEXP_MAIL status_t set_mail_notification(mail_notification*, bool save = true); status_t set_mail_notification(mail_notification*, bool save = true);
_IMPEXP_MAIL status_t check_for_mail(int32 *incoming_count = NULL); status_t check_for_mail(int32 *incoming_count = NULL);
_IMPEXP_MAIL status_t send_queued_mail(void); status_t send_queued_mail(void);
_IMPEXP_MAIL status_t forward_mail(entry_ref*, const char* recipients, bool now = true); status_t forward_mail(entry_ref*, const char* recipients, bool now = true);
_IMPEXP_MAIL ssize_t decode_base64(char *out, char *in, off_t length, ssize_t decode_base64(char *out, char *in, off_t length,
bool replace_cr = false); bool replace_cr = false);
_IMPEXP_MAIL ssize_t encode_base64(char *out, char *in, off_t length); ssize_t encode_base64(char *out, char *in, off_t length);
/* -----------------------------------------------------------------------*/ /* -----------------------------------------------------------------------*/
headers/os/media/BufferConsumer.h
+4
View File
@@ -14,6 +14,10 @@
#include <MediaDefs.h> #include <MediaDefs.h>
#include <MediaNode.h> #include <MediaNode.h>
class BBuffer;
class BBufferGroup;
class BRegion;
namespace BPrivate { namespace media { namespace BPrivate { namespace media {
class BMediaRosterEx; class BMediaRosterEx;
}} }}
headers/os/media/BufferGroup.h
+1
View File
@@ -14,6 +14,7 @@
#include <MediaDefs.h> #include <MediaDefs.h>
class BBuffer;
struct _shared_buffer_list; struct _shared_buffer_list;
class BBufferGroup class BBufferGroup
headers/os/media/BufferProducer.h
+4
View File
@@ -14,6 +14,10 @@
#include <MediaDefs.h> #include <MediaDefs.h>
#include <MediaNode.h> #include <MediaNode.h>
class BBuffer;
class BBufferGroup;
class BRegion;
namespace BPrivate { namespace media { namespace BPrivate { namespace media {
class BMediaRosterEx; class BMediaRosterEx;
}} }}
headers/os/media/FileInterface.h
+2
View File
@@ -15,6 +15,8 @@
#include <MediaDefs.h> #include <MediaDefs.h>
#include <MediaNode.h> #include <MediaNode.h>
struct entry_ref;
class BFileInterface : class BFileInterface :
public virtual BMediaNode public virtual BMediaNode
headers/os/media/MediaAddOn.h
+3
View File
@@ -17,6 +17,9 @@
#include <MediaDefs.h> #include <MediaDefs.h>
#include <Flattenable.h> #include <Flattenable.h>
class BMediaNode;
class BMimeType;
struct entry_ref;
struct dormant_node_info { struct dormant_node_info {
dormant_node_info(); dormant_node_info();
headers/os/media/MediaDefs.h
+26 -25
View File
@@ -21,6 +21,7 @@
#include <Looper.h> #include <Looper.h>
#endif #endif
struct media_node;
#define B_MEDIA_NAME_LENGTH 64 #define B_MEDIA_NAME_LENGTH 64
@@ -208,15 +209,15 @@ private:
uint32 _reserved_media_source_[2]; uint32 _reserved_media_source_[2];
}; };
_IMPEXP_MEDIA bool operator==(const media_destination & a, const media_destination & b); bool operator==(const media_destination & a, const media_destination & b);
_IMPEXP_MEDIA bool operator!=(const media_destination & a, const media_destination & b); bool operator!=(const media_destination & a, const media_destination & b);
_IMPEXP_MEDIA bool operator<(const media_destination & a, const media_destination & b); bool operator<(const media_destination & a, const media_destination & b);
_IMPEXP_MEDIA bool operator==(const media_source & a, const media_source & b); bool operator==(const media_source & a, const media_source & b);
_IMPEXP_MEDIA bool operator!=(const media_source & a, const media_source & b); bool operator!=(const media_source & a, const media_source & b);
_IMPEXP_MEDIA bool operator<(const media_source & a, const media_source & b); bool operator<(const media_source & a, const media_source & b);
_IMPEXP_MEDIA bool operator==(const media_node & a, const media_node & b); bool operator==(const media_node & a, const media_node & b);
_IMPEXP_MEDIA bool operator!=(const media_node & a, const media_node & b); bool operator!=(const media_node & a, const media_node & b);
_IMPEXP_MEDIA bool operator<(const media_node & a, const media_node & b); bool operator<(const media_node & a, const media_node & b);
@@ -518,21 +519,21 @@ struct media_format { /* no more than 192 bytes */
media_format & operator=(const media_format & clone); media_format & operator=(const media_format & clone);
}; };
_IMPEXP_MEDIA bool operator==(const media_raw_audio_format & a, const media_raw_audio_format & b); bool operator==(const media_raw_audio_format & a, const media_raw_audio_format & b);
_IMPEXP_MEDIA bool operator==(const media_multi_audio_info & a, const media_multi_audio_info & b); bool operator==(const media_multi_audio_info & a, const media_multi_audio_info & b);
_IMPEXP_MEDIA bool operator==(const media_multi_audio_format & a, const media_multi_audio_format & b); bool operator==(const media_multi_audio_format & a, const media_multi_audio_format & b);
_IMPEXP_MEDIA bool operator==(const media_encoded_audio_format & a, const media_encoded_audio_format & b); bool operator==(const media_encoded_audio_format & a, const media_encoded_audio_format & b);
_IMPEXP_MEDIA bool operator==(const media_video_display_info & a, const media_video_display_info & b); bool operator==(const media_video_display_info & a, const media_video_display_info & b);
_IMPEXP_MEDIA bool operator==(const media_raw_video_format & a, const media_raw_video_format & b); bool operator==(const media_raw_video_format & a, const media_raw_video_format & b);
_IMPEXP_MEDIA bool operator==(const media_encoded_video_format & a, const media_encoded_video_format & b); bool operator==(const media_encoded_video_format & a, const media_encoded_video_format & b);
_IMPEXP_MEDIA bool operator==(const media_multistream_format::vid_info & a, const media_multistream_format::vid_info & b); bool operator==(const media_multistream_format::vid_info & a, const media_multistream_format::vid_info & b);
_IMPEXP_MEDIA bool operator==(const media_multistream_format::avi_info & a, const media_multistream_format::avi_info & b); bool operator==(const media_multistream_format::avi_info & a, const media_multistream_format::avi_info & b);
_IMPEXP_MEDIA bool operator==(const media_multistream_format & a, const media_multistream_format & b); bool operator==(const media_multistream_format & a, const media_multistream_format & b);
_IMPEXP_MEDIA bool operator==(const media_format & a, const media_format & b); bool operator==(const media_format & a, const media_format & b);
/* return true if a and b are compatible (accounting for wildcards) */ /* return true if a and b are compatible (accounting for wildcards) */
_IMPEXP_MEDIA bool format_is_compatible(const media_format & a, const media_format & b); /* a is the format you want to feed to something accepting b */ bool format_is_compatible(const media_format & a, const media_format & b); /* a is the format you want to feed to something accepting b */
_IMPEXP_MEDIA bool string_for_format(const media_format & f, char * buf, size_t size); bool string_for_format(const media_format & f, char * buf, size_t size);
struct media_seek_tag { struct media_seek_tag {
char data[16]; char data[16];
@@ -587,8 +588,8 @@ struct media_file_format_id {
dev_t device; dev_t device;
uint32 internal_id; uint32 internal_id;
}; };
_IMPEXP_MEDIA bool operator==(const media_file_format_id & a, const media_file_format_id & b); bool operator==(const media_file_format_id & a, const media_file_format_id & b);
_IMPEXP_MEDIA bool operator<(const media_file_format_id & a, const media_file_format_id & b); bool operator<(const media_file_format_id & a, const media_file_format_id & b);
typedef enum { typedef enum {
B_ANY_FORMAT_FAMILY = 0, B_ANY_FORMAT_FAMILY = 0,
@@ -644,7 +645,7 @@ status_t get_next_file_format(int32 *cookie, media_file_format *mfi);
/* In your thread, read_port() into this struct, and call HandleMessage() on it. */ /* In your thread, read_port() into this struct, and call HandleMessage() on it. */
const size_t B_MEDIA_MESSAGE_SIZE = 16384; const size_t B_MEDIA_MESSAGE_SIZE = 16384;
_IMPEXP_MEDIA extern const char * B_MEDIA_SERVER_SIGNATURE; extern const char * B_MEDIA_SERVER_SIGNATURE;
class media_node; /* found in MediaNode.h */ class media_node; /* found in MediaNode.h */
struct media_input; struct media_input;
headers/os/media/MediaFile.h
+1 -1
View File
@@ -13,7 +13,7 @@ namespace BPrivate {
namespace media { namespace media {
class MediaExtractor; class MediaExtractor;
} }
class _IMPEXP_MEDIA MediaWriter; class MediaWriter;
class _AddonManager; class _AddonManager;
} }
headers/os/media/MediaFormats.h
+4 -4
View File
@@ -203,11 +203,11 @@ class BMediaFormats {
uint32 _reserved[30]; uint32 _reserved[30];
}; };
_IMPEXP_MEDIA bool operator==(const media_format_description & a, const media_format_description & b); bool operator==(const media_format_description & a, const media_format_description & b);
_IMPEXP_MEDIA bool operator<(const media_format_description & a, const media_format_description & b); bool operator<(const media_format_description & a, const media_format_description & b);
_IMPEXP_MEDIA bool operator==(const GUID & a, const GUID & b); bool operator==(const GUID & a, const GUID & b);
_IMPEXP_MEDIA bool operator<(const GUID & a, const GUID & b); bool operator<(const GUID & a, const GUID & b);
#endif /* __cplusplus */ #endif /* __cplusplus */
headers/os/media/MediaNode.h
+4 -1
View File
@@ -19,8 +19,11 @@
#include <new> #include <new>
class BBufferConsumer;
class BControllable;
class BFileInterface;
class BMediaAddOn; class BMediaAddOn;
class BTimeSource;
class media_node { class media_node {
headers/os/media/MediaRoster.h
+6 -2
View File
@@ -15,9 +15,13 @@
#include <MediaNode.h> #include <MediaNode.h>
#include <config_manager.h> #include <config_manager.h>
class BMimeType; class BBufferGroup;
struct dormant_flavor_info;
class BMediaAddOn; class BMediaAddOn;
class BMimeType;
class BParameterWeb;
class BString;
struct dormant_flavor_info;
struct entry_ref;
namespace BPrivate { namespace media { namespace BPrivate { namespace media {
class DefaultDeleter; class DefaultDeleter;
headers/os/media/MediaTheme.h
+5
View File
@@ -9,7 +9,12 @@
#include <Entry.h> #include <Entry.h>
#include <MediaDefs.h> #include <MediaDefs.h>
class BBitmap;
class BControl;
class BParameter;
class BParameterWeb; class BParameterWeb;
class BRect;
class BView;
class BMediaTheme { class BMediaTheme {
headers/os/media/ParameterWeb.h
+37 -44
View File
@@ -16,17 +16,10 @@
#if !defined(_CONTROL_WEB_H) #if !defined(_CONTROL_WEB_H)
#define _CONTROL_WEB_H #define _CONTROL_WEB_H
#include <MediaDefs.h>
#include <Flattenable.h> #include <Flattenable.h>
#include <MediaDefs.h>
#include <MediaNode.h> #include <MediaNode.h>
#include <TypeConstants.h>
#if !defined(_PR3_COMPATIBLE_)
enum {
B_MEDIA_PARAMETER_TYPE = 'BMCT',
B_MEDIA_PARAMETER_WEB_TYPE = 'BMCW',
B_MEDIA_PARAMETER_GROUP_TYPE= 'BMCG'
};
#endif
// It is highly unfortunate that a linker bug forces these symbols out // It is highly unfortunate that a linker bug forces these symbols out
@@ -34,50 +27,50 @@ enum {
/* These are control KINDs */ /* These are control KINDs */
/* kind used when you don't know or care */ /* kind used when you don't know or care */
extern _IMPEXP_MEDIA const char * const B_GENERIC; extern const char * const B_GENERIC;
/* kinds used for sliders */ /* kinds used for sliders */
extern _IMPEXP_MEDIA const char * const B_MASTER_GAIN; /* Main Volume */ extern const char * const B_MASTER_GAIN; /* Main Volume */
extern _IMPEXP_MEDIA const char * const B_GAIN; extern const char * const B_GAIN;
extern _IMPEXP_MEDIA const char * const B_BALANCE; extern const char * const B_BALANCE;
extern _IMPEXP_MEDIA const char * const B_FREQUENCY; /* like a radio tuner */ extern const char * const B_FREQUENCY; /* like a radio tuner */
extern _IMPEXP_MEDIA const char * const B_LEVEL; /* like for effects */ extern const char * const B_LEVEL; /* like for effects */
extern _IMPEXP_MEDIA const char * const B_SHUTTLE_SPEED; /* Play, SloMo, Scan 1.0 == regular */ extern const char * const B_SHUTTLE_SPEED; /* Play, SloMo, Scan 1.0 == regular */
extern _IMPEXP_MEDIA const char * const B_CROSSFADE; /* 0 == first input, +100 == second input */ extern const char * const B_CROSSFADE; /* 0 == first input, +100 == second input */
extern _IMPEXP_MEDIA const char * const B_EQUALIZATION; /* depth (dB) */ extern const char * const B_EQUALIZATION; /* depth (dB) */
/* kinds used for compressors */ /* kinds used for compressors */
extern _IMPEXP_MEDIA const char * const B_COMPRESSION; /* 0% == no compression, 99% == 100:1 compression */ extern const char * const B_COMPRESSION; /* 0% == no compression, 99% == 100:1 compression */
extern _IMPEXP_MEDIA const char * const B_QUALITY; /* 0% == full compression, 100% == no compression */ extern const char * const B_QUALITY; /* 0% == full compression, 100% == no compression */
extern _IMPEXP_MEDIA const char * const B_BITRATE; /* in bits/second */ extern const char * const B_BITRATE; /* in bits/second */
extern _IMPEXP_MEDIA const char * const B_GOP_SIZE; /* Group Of Pictures. a k a "Keyframe every N frames" */ extern const char * const B_GOP_SIZE; /* Group Of Pictures. a k a "Keyframe every N frames" */
/* kinds used for selectors */ /* kinds used for selectors */
extern _IMPEXP_MEDIA const char * const B_MUTE; /* 0 == thru, 1 == mute */ extern const char * const B_MUTE; /* 0 == thru, 1 == mute */
extern _IMPEXP_MEDIA const char * const B_ENABLE; /* 0 == disable, 1 == enable */ extern const char * const B_ENABLE; /* 0 == disable, 1 == enable */
extern _IMPEXP_MEDIA const char * const B_INPUT_MUX; /* "value" 1-N == input selected */ extern const char * const B_INPUT_MUX; /* "value" 1-N == input selected */
extern _IMPEXP_MEDIA const char * const B_OUTPUT_MUX; /* "value" 1-N == output selected */ extern const char * const B_OUTPUT_MUX; /* "value" 1-N == output selected */
extern _IMPEXP_MEDIA const char * const B_TUNER_CHANNEL; /* like cable TV */ extern const char * const B_TUNER_CHANNEL; /* like cable TV */
extern _IMPEXP_MEDIA const char * const B_TRACK; /* like a CD player; "value" should be 1-N */ extern const char * const B_TRACK; /* like a CD player; "value" should be 1-N */
extern _IMPEXP_MEDIA const char * const B_RECSTATE; /* like mutitrack tape deck, 0 == silent, 1 == play, 2 == record */ extern const char * const B_RECSTATE; /* like mutitrack tape deck, 0 == silent, 1 == play, 2 == record */
extern _IMPEXP_MEDIA const char * const B_SHUTTLE_MODE; /* -1 == backwards, 0 == stop, 1 == play, 2 == pause/cue */ extern const char * const B_SHUTTLE_MODE; /* -1 == backwards, 0 == stop, 1 == play, 2 == pause/cue */
extern _IMPEXP_MEDIA const char * const B_RESOLUTION; extern const char * const B_RESOLUTION;
extern _IMPEXP_MEDIA const char * const B_COLOR_SPACE; /* "value" should be color_space */ extern const char * const B_COLOR_SPACE; /* "value" should be color_space */
extern _IMPEXP_MEDIA const char * const B_FRAME_RATE; extern const char * const B_FRAME_RATE;
extern _IMPEXP_MEDIA const char * const B_VIDEO_FORMAT; /* 1 == NTSC-M, 2 == NTSC-J, 3 == PAL-BDGHI, 4 == PAL-M, 5 == PAL-N, 6 == SECAM, 7 == MPEG-1, 8 == MPEG-2 */ extern const char * const B_VIDEO_FORMAT; /* 1 == NTSC-M, 2 == NTSC-J, 3 == PAL-BDGHI, 4 == PAL-M, 5 == PAL-N, 6 == SECAM, 7 == MPEG-1, 8 == MPEG-2 */
/* kinds used for junctions */ /* kinds used for junctions */
// the prefix of "WEB" is to avoid collission with an enum in Defs.h // the prefix of "WEB" is to avoid collission with an enum in Defs.h
extern _IMPEXP_MEDIA const char * const B_WEB_PHYSICAL_INPUT; /* a jack on the back of the card */ extern const char * const B_WEB_PHYSICAL_INPUT; /* a jack on the back of the card */
extern _IMPEXP_MEDIA const char * const B_WEB_PHYSICAL_OUTPUT; extern const char * const B_WEB_PHYSICAL_OUTPUT;
extern _IMPEXP_MEDIA const char * const B_WEB_ADC_CONVERTER; /* from analog to digital signals */ extern const char * const B_WEB_ADC_CONVERTER; /* from analog to digital signals */
extern _IMPEXP_MEDIA const char * const B_WEB_DAC_CONVERTER; /* from digital to analog signals */ extern const char * const B_WEB_DAC_CONVERTER; /* from digital to analog signals */
extern _IMPEXP_MEDIA const char * const B_WEB_LOGICAL_INPUT; /* an "input" that may not be physical */ extern const char * const B_WEB_LOGICAL_INPUT; /* an "input" that may not be physical */
extern _IMPEXP_MEDIA const char * const B_WEB_LOGICAL_OUTPUT; extern const char * const B_WEB_LOGICAL_OUTPUT;
extern _IMPEXP_MEDIA const char * const B_WEB_LOGICAL_BUS; /* a logical connection point that is neither input nor output; auxilliary bus */ extern const char * const B_WEB_LOGICAL_BUS; /* a logical connection point that is neither input nor output; auxilliary bus */
extern _IMPEXP_MEDIA const char * const B_WEB_BUFFER_INPUT; /* an input that corresponds to a media_input */ extern const char * const B_WEB_BUFFER_INPUT; /* an input that corresponds to a media_input */
extern _IMPEXP_MEDIA const char * const B_WEB_BUFFER_OUTPUT; extern const char * const B_WEB_BUFFER_OUTPUT;
// a simple transport control is a discrete parameter with five values (states): // a simple transport control is a discrete parameter with five values (states):
// rewinding, stopped, playing, paused, and fast-forwarding // rewinding, stopped, playing, paused, and fast-forwarding
extern _IMPEXP_MEDIA const char * const B_SIMPLE_TRANSPORT; extern const char * const B_SIMPLE_TRANSPORT;
class BList; class BList;
class BParameterGroup; class BParameterGroup;
headers/os/media/PlaySound.h
-3
View File
@@ -18,17 +18,14 @@
typedef sem_id sound_handle; typedef sem_id sound_handle;
_IMPEXP_MEDIA
sound_handle play_sound(const entry_ref *soundRef, sound_handle play_sound(const entry_ref *soundRef,
bool mix, bool mix,
bool queue, bool queue,
bool background bool background
); );
_IMPEXP_MEDIA
status_t stop_sound(sound_handle handle); status_t stop_sound(sound_handle handle);
_IMPEXP_MEDIA
status_t wait_for_sound(sound_handle handle); status_t wait_for_sound(sound_handle handle);
#endif /* #ifndef _PLAY_SOUND_H*/ #endif /* #ifndef _PLAY_SOUND_H*/
headers/os/media/RealtimeAlloc.h
+9 -9
View File
@@ -28,20 +28,20 @@ typedef struct rtm_pool rtm_pool;
/* If out_pool is NULL, the default pool will be created if it isn't already. */ /* If out_pool is NULL, the default pool will be created if it isn't already. */
/* If the default pool is already created, it will return EALREADY. */ /* If the default pool is already created, it will return EALREADY. */
#if defined(__cplusplus) #if defined(__cplusplus)
_IMPEXP_MEDIA status_t rtm_create_pool(rtm_pool ** out_pool, size_t total_size, const char * name=NULL); status_t rtm_create_pool(rtm_pool ** out_pool, size_t total_size, const char * name=NULL);
#else #else
_IMPEXP_MEDIA status_t rtm_create_pool(rtm_pool ** out_pool, size_t total_size, const char * name); status_t rtm_create_pool(rtm_pool ** out_pool, size_t total_size, const char * name);
#endif #endif
_IMPEXP_MEDIA status_t rtm_delete_pool(rtm_pool * pool); status_t rtm_delete_pool(rtm_pool * pool);
/* If NULL is passed for pool, the default pool is used (if created). */ /* If NULL is passed for pool, the default pool is used (if created). */
_IMPEXP_MEDIA void * rtm_alloc(rtm_pool * pool, size_t size); void * rtm_alloc(rtm_pool * pool, size_t size);
_IMPEXP_MEDIA status_t rtm_free(void * data); status_t rtm_free(void * data);
_IMPEXP_MEDIA status_t rtm_realloc(void ** data, size_t new_size); status_t rtm_realloc(void ** data, size_t new_size);
_IMPEXP_MEDIA status_t rtm_size_for(void * data); status_t rtm_size_for(void * data);
_IMPEXP_MEDIA status_t rtm_phys_size_for(void * data); status_t rtm_phys_size_for(void * data);
/* Return the default pool, or NULL if not yet initialized */ /* Return the default pool, or NULL if not yet initialized */
_IMPEXP_MEDIA rtm_pool * rtm_default_pool(); rtm_pool * rtm_default_pool();
#if defined(__cplusplus) #if defined(__cplusplus)
} }
headers/os/media/Sound.h
+2
View File
@@ -6,7 +6,9 @@
#include <MediaDefs.h> #include <MediaDefs.h>
class BMediaFile;
class BSoundFile; class BSoundFile;
struct entry_ref;
namespace BPrivate { namespace BPrivate {
class BTrackReader; class BTrackReader;
headers/os/media/SoundPlayer.h
+2
View File
@@ -11,6 +11,8 @@
#include <exception> #include <exception>
class BContinuousParameter;
class BParameterWeb;
class BSound; class BSound;
class _SoundPlayNode; class _SoundPlayNode;
headers/os/media/TimeCode.h
+6 -6
View File
@@ -36,12 +36,12 @@ struct timecode_info {
char format[32]; /* for sprintf(fmt, h, m, s, f) */ char format[32]; /* for sprintf(fmt, h, m, s, f) */
char _reserved_[64]; char _reserved_[64];
}; };
_IMPEXP_MEDIA status_t us_to_timecode(bigtime_t micros, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code = NULL); status_t us_to_timecode(bigtime_t micros, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code = NULL);
_IMPEXP_MEDIA status_t timecode_to_us(int hours, int minutes, int seconds, int frames, bigtime_t * micros, const timecode_info * code = NULL); status_t timecode_to_us(int hours, int minutes, int seconds, int frames, bigtime_t * micros, const timecode_info * code = NULL);
_IMPEXP_MEDIA status_t frames_to_timecode(int32 l_frames, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code = NULL); status_t frames_to_timecode(int32 l_frames, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code = NULL);
_IMPEXP_MEDIA status_t timecode_to_frames(int hours, int minutes, int seconds, int frames, int32 * l_frames, const timecode_info * code = NULL); status_t timecode_to_frames(int hours, int minutes, int seconds, int frames, int32 * l_frames, const timecode_info * code = NULL);
_IMPEXP_MEDIA status_t get_timecode_description(timecode_type type, timecode_info * out_timecode); status_t get_timecode_description(timecode_type type, timecode_info * out_timecode);
_IMPEXP_MEDIA status_t count_timecodes(); status_t count_timecodes();
/* we may want a set_default_timecode, too -- but that's bad from a thread standpoint */ /* we may want a set_default_timecode, too -- but that's bad from a thread standpoint */
headers/os/media/TimedEventQueue.h
+4 -4
View File
@@ -44,10 +44,10 @@ struct media_timed_event {
uint32 _reserved_media_timed_event_[8]; uint32 _reserved_media_timed_event_[8];
}; };
_IMPEXP_MEDIA bool operator==(const media_timed_event & a, const media_timed_event & b); bool operator==(const media_timed_event & a, const media_timed_event & b);
_IMPEXP_MEDIA bool operator!=(const media_timed_event & a, const media_timed_event & b); bool operator!=(const media_timed_event & a, const media_timed_event & b);
_IMPEXP_MEDIA bool operator<(const media_timed_event & a, const media_timed_event & b); bool operator<(const media_timed_event & a, const media_timed_event & b);
_IMPEXP_MEDIA bool operator>(const media_timed_event & a, const media_timed_event &b); bool operator>(const media_timed_event & a, const media_timed_event &b);
class BTimedEventQueue { class BTimedEventQueue {
headers/os/midi/Synth.h
+1 -1
View File
@@ -104,6 +104,6 @@ private:
uint32 _reserved[10]; uint32 _reserved[10];
}; };
extern _IMPEXP_MIDI BSynth* be_synth; extern BSynth* be_synth;
#endif // _SYNTH_H #endif // _SYNTH_H
headers/os/net/net_settings.h
+2 -2
View File
@@ -46,11 +46,11 @@ typedef struct _net_settings {
/* /*
* For finding and setting network preferences * For finding and setting network preferences
*/ */
extern _IMPEXP_NET extern
char *find_net_setting(net_settings *ncw, char *find_net_setting(net_settings *ncw,
const char *heading, const char *name, char *value, const char *heading, const char *name, char *value,
unsigned nbytes); unsigned nbytes);
extern _IMPEXP_NET extern
status_t set_net_setting(net_settings *ncw, status_t set_net_setting(net_settings *ncw,
const char *heading, const char *name, const char *heading, const char *name,
const char *value); const char *value);
headers/os/storage/Node.h
+3
View File
@@ -9,6 +9,9 @@
#include <Statable.h> #include <Statable.h>
class BDirectory; class BDirectory;
class BString;
struct entry_ref;
//! Reference structure to a particular vnode on a particular device //! Reference structure to a particular vnode on a particular device
/*! <b>node_ref</b> - A node reference. /*! <b>node_ref</b> - A node reference.
headers/os/storage/SymLink.h
+8 -18
View File
@@ -1,23 +1,17 @@
//---------------------------------------------------------------------- /*
// This software is part of the OpenBeOS distribution and is covered * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
// by the OpenBeOS license. * Distributed under the terms of the MIT License.
// */
// File Name: SymLink.h
//---------------------------------------------------------------------
/*!
\file SymLink.h
BSymLink interface declaration.
*/
#ifndef _SYM_LINK_H #ifndef _SYM_LINK_H
#define _SYM_LINK_H #define _SYM_LINK_H
#include <Node.h> #include <Node.h>
#include <StorageDefs.h> #include <StorageDefs.h>
#ifdef USE_OPENBEOS_NAMESPACE class BDirectory;
namespace OpenBeOS { class BPath;
#endif
/*! /*!
\class BSymLink \class BSymLink
@@ -61,8 +55,4 @@ private:
int get_fd() const; int get_fd() const;
}; };
#ifdef USE_OPENBEOS_NAMESPACE
}; // namespace OpenBeOS
#endif
#endif // _SYM_LINK_H #endif // _SYM_LINK_H
headers/os/support/Debug.h
+7 -7
View File
@@ -18,20 +18,20 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
extern _IMPEXP_ROOT bool _rtDebugFlag; extern bool _rtDebugFlag;
_IMPEXP_ROOT bool _debugFlag(void); bool _debugFlag(void);
_IMPEXP_ROOT bool _setDebugFlag(bool); bool _setDebugFlag(bool);
#if __GNUC__ #if __GNUC__
int _debugPrintf(const char *, ...) __attribute__ ((format (__printf__, 1, 2))); int _debugPrintf(const char *, ...) _PRINTFLIKE(1, 2);
int _sPrintf(const char *, ...) __attribute__ ((format (__printf__, 1, 2))); int _sPrintf(const char *, ...) _PRINTFLIKE(1, 2);
#else #else
int _debugPrintf(const char *, ...); int _debugPrintf(const char *, ...);
int _sPrintf(const char *, ...); int _sPrintf(const char *, ...);
#endif #endif
_IMPEXP_ROOT int _xdebugPrintf(const char *, ...); int _xdebugPrintf(const char *, ...);
_IMPEXP_ROOT int _debuggerAssert(const char *, int, char *); int _debuggerAssert(const char *, int, char *);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
headers/os/support/TypeConstants.h
+14 -14
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2005, Haiku, Inc. All Rights Reserved. * Copyright 2005-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Author: * Author:
@@ -60,19 +60,19 @@ enum {
B_ASCII_TYPE = 'TEXT' // use B_STRING_TYPE instead B_ASCII_TYPE = 'TEXT' // use B_STRING_TYPE instead
}; };
//----- System-wide MIME types for handling URL's ------------------------------ // System-wide MIME types for handling URL's
extern _IMPEXP_BE const char *B_URL_HTTP; // application/x-vnd.Be.URL.http extern const char *B_URL_HTTP; // application/x-vnd.Be.URL.http
extern _IMPEXP_BE const char *B_URL_HTTPS; // application/x-vnd.Be.URL.https extern const char *B_URL_HTTPS; // application/x-vnd.Be.URL.https
extern _IMPEXP_BE const char *B_URL_FTP; // application/x-vnd.Be.URL.ftp extern const char *B_URL_FTP; // application/x-vnd.Be.URL.ftp
extern _IMPEXP_BE const char *B_URL_GOPHER; // application/x-vnd.Be.URL.gopher extern const char *B_URL_GOPHER; // application/x-vnd.Be.URL.gopher
extern _IMPEXP_BE const char *B_URL_MAILTO; // application/x-vnd.Be.URL.mailto extern const char *B_URL_MAILTO; // application/x-vnd.Be.URL.mailto
extern _IMPEXP_BE const char *B_URL_NEWS; // application/x-vnd.Be.URL.news extern const char *B_URL_NEWS; // application/x-vnd.Be.URL.news
extern _IMPEXP_BE const char *B_URL_NNTP; // application/x-vnd.Be.URL.nntp extern const char *B_URL_NNTP; // application/x-vnd.Be.URL.nntp
extern _IMPEXP_BE const char *B_URL_TELNET; // application/x-vnd.Be.URL.telnet extern const char *B_URL_TELNET; // application/x-vnd.Be.URL.telnet
extern _IMPEXP_BE const char *B_URL_RLOGIN; // application/x-vnd.Be.URL.rlogin extern const char *B_URL_RLOGIN; // application/x-vnd.Be.URL.rlogin
extern _IMPEXP_BE const char *B_URL_TN3270; // application/x-vnd.Be.URL.tn3270 extern const char *B_URL_TN3270; // application/x-vnd.Be.URL.tn3270
extern _IMPEXP_BE const char *B_URL_WAIS; // application/x-vnd.Be.URL.wais extern const char *B_URL_WAIS; // application/x-vnd.Be.URL.wais
extern _IMPEXP_BE const char *B_URL_FILE; // application/x-vnd.Be.URL.file extern const char *B_URL_FILE; // application/x-vnd.Be.URL.file
#endif // _TYPE_CONSTANTS_H #endif // _TYPE_CONSTANTS_H
headers/os/translation/TranslationUtils.h
+6 -2
View File
@@ -10,9 +10,13 @@
#include <SupportDefs.h> #include <SupportDefs.h>
class BBitmap; class BBitmap;
class BTranslatorRoster; class BFile;
class BPositionIO;
class BMenu; class BMenu;
class BMessage;
class BPositionIO;
class BTextView;
class BTranslatorRoster;
struct entry_ref;
class BTranslationUtils { class BTranslationUtils {
headers/os/translation/Translator.h
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2006, Haiku, Inc. All Rights Reserved. * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _TRANSLATOR_H #ifndef _TRANSLATOR_H
@@ -69,7 +69,7 @@ class BTranslator : public BArchivable {
// API. You will be called for values of n starting at 0 and increasing; // API. You will be called for values of n starting at 0 and increasing;
// return 0 when you can't make another kind of translator (i.e. for n=1 // return 0 when you can't make another kind of translator (i.e. for n=1
// if you only implement one subclass of BTranslator). Ignore flags for now. // if you only implement one subclass of BTranslator). Ignore flags for now.
extern "C" _EXPORT BTranslator *make_nth_translator(int32 n, image_id you, extern "C" BTranslator *make_nth_translator(int32 n, image_id you,
uint32 flags, ...); uint32 flags, ...);
#endif /* _TRANSLATOR_H */ #endif /* _TRANSLATOR_H */
headers/os/translation/TranslatorAddOn.h
+2 -1
View File
@@ -15,9 +15,10 @@
#ifndef _TRANSLATOR_ADD_ON_H #ifndef _TRANSLATOR_ADD_ON_H
#define _TRANSLATOR_ADD_ON_H #define _TRANSLATOR_ADD_ON_H
#include <TranslationDefs.h> #include <TranslationDefs.h>
class BMessage;
class BView; class BView;
class BRect; class BRect;
class BPositionIO; class BPositionIO;
headers/os/translation/TranslatorFormats.h
+12 -12
View File
@@ -21,18 +21,18 @@
/* extensions used in the extension BMessage. Use of these */ /* extensions used in the extension BMessage. Use of these */
/* is described in the documentation. */ /* is described in the documentation. */
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_HEADER_ONLY[]; extern char B_TRANSLATOR_EXT_HEADER_ONLY[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_DATA_ONLY[]; extern char B_TRANSLATOR_EXT_DATA_ONLY[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_COMMENT[]; extern char B_TRANSLATOR_EXT_COMMENT[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_TIME[]; extern char B_TRANSLATOR_EXT_TIME[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_FRAME[]; extern char B_TRANSLATOR_EXT_FRAME[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_BITMAP_RECT[]; extern char B_TRANSLATOR_EXT_BITMAP_RECT[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_BITMAP_COLOR_SPACE[]; extern char B_TRANSLATOR_EXT_BITMAP_COLOR_SPACE[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_BITMAP_PALETTE[]; extern char B_TRANSLATOR_EXT_BITMAP_PALETTE[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_SOUND_CHANNEL[]; extern char B_TRANSLATOR_EXT_SOUND_CHANNEL[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_SOUND_MONO[]; extern char B_TRANSLATOR_EXT_SOUND_MONO[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_SOUND_MARKER[]; extern char B_TRANSLATOR_EXT_SOUND_MARKER[];
_IMPEXP_TRANSLATION extern char B_TRANSLATOR_EXT_SOUND_LOOP[]; extern char B_TRANSLATOR_EXT_SOUND_LOOP[];
#if defined(_DATATYPES_COMPATIBLE_) #if defined(_DATATYPES_COMPATIBLE_)
#define kCommentExtension "/comment" #define kCommentExtension "/comment"
headers/os/translation/TranslatorRoster.h
+7 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2006, Haiku, Inc. All Rights Reserved. * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _TRANSLATOR_ROSTER_H #ifndef _TRANSLATOR_ROSTER_H
@@ -12,10 +12,14 @@
struct translation_format; struct translation_format;
class BBitmap; class BBitmap;
class BView; class BMessage;
class BMessenger;
class BPositionIO; class BPositionIO;
class BQuery; class BQuery;
class BMessage; class BRect;
class BTranslator;
class BView;
struct entry_ref;
class BTranslatorRoster : public BArchivable { class BTranslatorRoster : public BArchivable {
headers/private/app/AreaLink.h
+3 -2
View File
@@ -13,12 +13,13 @@
#include <List.h> #include <List.h>
#include <OS.h> #include <OS.h>
class AreaLinkHeader;
class BPoint;
#define MAX_ATTACHMENT_SIZE 65535 // in bytes #define MAX_ATTACHMENT_SIZE 65535 // in bytes
#define SIZE_SIZE 2 // size of the size records in an AreaLink area #define SIZE_SIZE 2 // size of the size records in an AreaLink area
class AreaLinkHeader;
class AreaLink { class AreaLink {
public: public:
headers/private/app/LooperList.h
+1
View File
@@ -15,6 +15,7 @@
#include <vector> #include <vector>
class BList;
class BLooper; class BLooper;
headers/private/app/ServerLink.h
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2006, Haiku. * Copyright 2001-2007, Haiku.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -15,9 +15,9 @@
#include <LinkReceiver.h> #include <LinkReceiver.h>
#include <LinkSender.h> #include <LinkSender.h>
class BShape;
class BString; class BString;
/* /*
* Error checking rules: (for if you don't want to check every return code) * Error checking rules: (for if you don't want to check every return code)
* - Calling EndMessage() is optional, implied by Flush() or StartMessage(). * - Calling EndMessage() is optional, implied by Flush() or StartMessage().
headers/private/app/TokenSpace.h
+1 -1
View File
@@ -60,7 +60,7 @@ class BTokenSpace : public BLocker {
int32 fTokenCount; int32 fTokenCount;
}; };
extern _IMPEXP_BE BTokenSpace gDefaultTokens; extern BTokenSpace gDefaultTokens;
} // namespace BPrivate } // namespace BPrivate
headers/private/graphics/common/edid_raw.h
+12 -14
View File
@@ -1,22 +1,21 @@
/* /*
Copyright (c) 2003, Thomas Kurschel * Copyright 2003, Thomas Kurschel. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
Part of DDC driver
Raw EDID data block.
Raw data are packed in a really weird way. Never even
think about using it directly, instead translate it via decode_edidpixel_clock
first. I did my best to make the code endian-independant, but
I cannot guarantee that I haven't missed something.
*/
#ifndef _EDID_RAW_H #ifndef _EDID_RAW_H
#define _EDID_RAW_H #define _EDID_RAW_H
#include "bendian_bitfield.h" #include "bendian_bitfield.h"
/*! Raw EDID data block.
Raw data are packed in a really weird way. Never even
think about using it directly, instead translate it via decode_edid()
first.
*/
#define EDID1_NUM_DETAILED_MONITOR_DESC 4 #define EDID1_NUM_DETAILED_MONITOR_DESC 4
#define EDID1_NUM_STD_TIMING 8 #define EDID1_NUM_STD_TIMING 8
#define EDID1_NUM_EXTRA_STD_TIMING 6 #define EDID1_NUM_EXTRA_STD_TIMING 6
@@ -249,7 +248,6 @@ typedef union _PACKED {
edid1_monitor_range monitor_range; edid1_monitor_range monitor_range;
edid1_whitepoint_raw whitepoint; edid1_whitepoint_raw whitepoint;
edid1_std_timing_raw std_timing[EDID1_NUM_EXTRA_STD_TIMING]; edid1_std_timing_raw std_timing[EDID1_NUM_EXTRA_STD_TIMING];
} data; } data;
} extra; } extra;
} edid1_detailed_monitor_raw; } edid1_detailed_monitor_raw;
headers/private/interface/BMCPrivate.h
+17 -18
View File
@@ -6,20 +6,22 @@
* Marc Flerackers (mflerackers@androme.be) * Marc Flerackers (mflerackers@androme.be)
* Stephan Aßmus <superstippi@gmx.de> * Stephan Aßmus <superstippi@gmx.de>
*/ */
#ifndef _BMC_PRIVATE_H #ifndef _BMC_PRIVATE_H
#define _BMC_PRIVATE_H #define _BMC_PRIVATE_H
#include <BeBuild.h> #include <BeBuild.h>
#include <MenuBar.h> #include <MenuBar.h>
#include <MenuItem.h> #include <MenuItem.h>
#include <MessageFilter.h> #include <MessageFilter.h>
class BMessageRunner;
class _BMCFilter_ : public BMessageFilter { class _BMCFilter_ : public BMessageFilter {
public: public:
_BMCFilter_(BMenuField *menuField, uint32 what); _BMCFilter_(BMenuField *menuField, uint32 what);
~_BMCFilter_(); virtual ~_BMCFilter_();
filter_result Filter(BMessage *message, BHandler **handler); filter_result Filter(BMessage *message, BHandler **handler);
private: private:
@@ -28,37 +30,34 @@ private:
}; };
//------------------------------------------------------------------------------
class _BMCMenuBar_ : public BMenuBar { class _BMCMenuBar_ : public BMenuBar {
public: public:
_BMCMenuBar_(BRect frame, bool fixed_size, _BMCMenuBar_(BRect frame, bool fixed_size,
BMenuField *menuField); BMenuField *menuField);
_BMCMenuBar_(BMessage *data); _BMCMenuBar_(BMessage *data);
virtual ~_BMCMenuBar_(); virtual ~_BMCMenuBar_();
static BArchivable *Instantiate(BMessage *data); static BArchivable *Instantiate(BMessage *data);
virtual void AttachedToWindow(); virtual void AttachedToWindow();
virtual void Draw(BRect updateRect); virtual void Draw(BRect updateRect);
virtual void FrameResized(float width, float height); virtual void FrameResized(float width, float height);
virtual void MessageReceived(BMessage* msg); virtual void MessageReceived(BMessage* msg);
virtual void MakeFocus(bool focused = true); virtual void MakeFocus(bool focused = true);
void TogglePopUpMarker(bool show) { fShowPopUpMarker = show; } void TogglePopUpMarker(bool show) { fShowPopUpMarker = show; }
bool IsPopUpMarkerShown() const { return fShowPopUpMarker; } bool IsPopUpMarkerShown() const { return fShowPopUpMarker; }
virtual BSize MaxSize(); virtual BSize MaxSize();
private: private:
_BMCMenuBar_&operator=(const _BMCMenuBar_ &); _BMCMenuBar_&operator=(const _BMCMenuBar_ &);
BMenuField *fMenuField; BMenuField *fMenuField;
bool fFixedSize; bool fFixedSize;
BMessageRunner *fRunner; BMessageRunner *fRunner;
bool fShowPopUpMarker; bool fShowPopUpMarker;
float fPreviousWidth; float fPreviousWidth;
}; };
//------------------------------------------------------------------------------
#endif // _BMC_PRIVATE_H #endif // _BMC_PRIVATE_H
headers/private/interface/ColorConversion.h
+4
View File
@@ -1,8 +1,12 @@
#ifndef _COLOR_CONVERSION_H_ #ifndef _COLOR_CONVERSION_H_
#define _COLOR_CONVERSION_H_ #define _COLOR_CONVERSION_H_
#include <GraphicsDefs.h> #include <GraphicsDefs.h>
class BPoint;
namespace BPrivate { namespace BPrivate {
status_t ConvertBits(const void *srcBits, void *dstBits, int32 srcBitsLength, status_t ConvertBits(const void *srcBits, void *dstBits, int32 srcBitsLength,
headers/private/interface/ColorTools.h
+1 -1
View File
@@ -48,7 +48,7 @@ All rights reserved.
#include <GraphicsDefs.h> #include <GraphicsDefs.h>
#if B_BEOS_VERSION <= B_BEOS_VERSION_MAUI #if B_BEOS_VERSION <= B_BEOS_VERSION_5
namespace BExperimental { namespace BExperimental {
headers/private/interface/PictureDataWriter.h
+7 -4
View File
@@ -1,13 +1,13 @@
/* /*
* Copyright 2006, Haiku Inc. * Copyright 2006-2007, Haiku Inc.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Stefano Ceccherini (burton666@libero.it) * Stefano Ceccherini (burton666@libero.it)
*/ */
#ifndef _PICTURE_DATA_WRITER_H
#define _PICTURE_DATA_WRITER_H
#ifndef __PICTUREDATAWRITER_H
#define __PICTUREDATAWRITER_H
#include <InterfaceDefs.h> #include <InterfaceDefs.h>
#include <Font.h> #include <Font.h>
@@ -16,6 +16,9 @@
#include <stack> #include <stack>
class BPositionIO; class BPositionIO;
class BRegion;
class PictureDataWriter { class PictureDataWriter {
public: public:
PictureDataWriter(); PictureDataWriter();
@@ -80,4 +83,4 @@ private:
std::stack<off_t> fStack; std::stack<off_t> fStack;
}; };
#endif // __PICTUREDATAWRITER_H #endif // _PICTURE_DATA_WRITER_H
headers/private/interface/PicturePlayer.h
+15 -14
View File
@@ -7,11 +7,10 @@
* Stefano Ceccherini (stefano.ceccherini@gmail.com) * Stefano Ceccherini (stefano.ceccherini@gmail.com)
* Marcus Overhagen (marcus@overhagen.de) * Marcus Overhagen (marcus@overhagen.de)
*/ */
#ifndef _PICTURE_PLAYER_H
#define _PICTURE_PLAYER_H
/** PicturePlayer is used to play picture data. */ /*! PicturePlayer is used to play picture data. */
#ifndef _PICTUREPLAYER_H
#define _PICTUREPLAYER_H
#include <GraphicsDefs.h> #include <GraphicsDefs.h>
@@ -19,24 +18,26 @@
#include <Rect.h> #include <Rect.h>
#include <DataIO.h> #include <DataIO.h>
class BList;
namespace BPrivate { namespace BPrivate {
class PicturePlayer { class PicturePlayer {
public: public:
PicturePlayer(); PicturePlayer();
PicturePlayer(const void *data, size_t size, BList *pictures); PicturePlayer(const void *data, size_t size, BList *pictures);
virtual ~PicturePlayer(); virtual ~PicturePlayer();
status_t Play(void **callBackTable, int32 tableEntries, status_t Play(void **callBackTable, int32 tableEntries,
void *userData); void *userData);
private: private:
const void *fData; const void* fData;
size_t fSize; size_t fSize;
BList *fPictures; BList* fPictures;
}; };
}; // namespace BPrivate } // namespace BPrivate
#endif // _PICTUREPLAYER_H #endif // _PICTURE_PLAYER_H
headers/private/interface/input_globals.h
+7 -27
View File
@@ -1,38 +1,18 @@
//------------------------------------------------------------------------------ /*
// Copyright (c) 2004, Haiku * Copyright 2004-2007, Haiku, Inc. All Rights Reserved.
// * Distributed under the terms of the MIT License.
// Permission is hereby granted, free of charge, to any person obtaining a */
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// File Name: input_globals.h
// Author:
// Description:
//------------------------------------------------------------------------------
#ifndef __INPUT_GLOBALS_H #ifndef __INPUT_GLOBALS_H
#define __INPUT_GLOBALS_H #define __INPUT_GLOBALS_H
#include <InterfaceDefs.h> #include <InterfaceDefs.h>
#include <SupportDefs.h> #include <SupportDefs.h>
class BMessage;
status_t _control_input_server_(BMessage *command, BMessage *reply); status_t _control_input_server_(BMessage *command, BMessage *reply);
status_t _restore_key_map_(); status_t _restore_key_map_();
void _get_key_map(key_map **map, char **key_buffer, ssize_t *key_buffer_size); void _get_key_map(key_map **map, char **key_buffer, ssize_t *key_buffer_size);
#endif // __INPUT_GLOBALS_H #endif // __INPUT_GLOBALS_H
headers/private/print/libprint/PrinterDriver.h
+4 -2
View File
@@ -1,8 +1,10 @@
#ifndef _PRINTER_DRIVER_H #ifndef _PRINTER_DRIVER_H
#define _PRINTER_DRIVER_H #define _PRINTER_DRIVER_H
#include <SupportDefs.h> #include <SupportDefs.h>
class BFile; class BFile;
class BMessage; class BMessage;
class BNode; class BNode;
@@ -50,6 +52,6 @@ private:
GraphicsDriver* fGraphicsDriver; GraphicsDriver* fGraphicsDriver;
}; };
_IMPEXP_BE PrinterDriver* instantiate_printer_driver(BNode* printerFolder = NULL); PrinterDriver* instantiate_printer_driver(BNode* printerFolder = NULL);
#endif #endif // _PRINTER_DRIVER_H
headers/private/storage/DiskDeviceList.h
+2 -1
View File
@@ -11,12 +11,13 @@
#include <Handler.h> #include <Handler.h>
#include <ObjectList.h> #include <ObjectList.h>
class BDiskDevice; class BDiskDevice;
class BDiskDeviceRoster; class BDiskDeviceRoster;
class BLocker;
class BPartition; class BPartition;
class BSession; class BSession;
class BDiskDeviceList : public BHandler { class BDiskDeviceList : public BHandler {
public: public:
BDiskDeviceList(bool useOwnLocker = true); BDiskDeviceList(bool useOwnLocker = true);
headers/private/storage/mime/AssociatedTypes.h
+7 -9
View File
@@ -1,15 +1,11 @@
//---------------------------------------------------------------------- /*
// This software is part of the OpenBeOS distribution and is covered * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
// by the OpenBeOS license. * Distributed under the terms of the MIT License.
//--------------------------------------------------------------------- */
/*!
\file AssociatedTypes.h
AssociatedTypes class declarations
*/
#ifndef _MIME_ASSOCIATED_TYPES_H #ifndef _MIME_ASSOCIATED_TYPES_H
#define _MIME_ASSOCIATED_TYPES_H #define _MIME_ASSOCIATED_TYPES_H
#include <SupportDefs.h> #include <SupportDefs.h>
#include <map> #include <map>
@@ -18,6 +14,8 @@
class BMessage; class BMessage;
class BString; class BString;
struct entry_ref;
namespace BPrivate { namespace BPrivate {
namespace Storage { namespace Storage {
headers/private/storage/mime/SnifferRules.h
+8 -10
View File
@@ -1,22 +1,20 @@
//---------------------------------------------------------------------- /*
// This software is part of the OpenBeOS distribution and is covered * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
// by the OpenBeOS license. * Distributed under the terms of the MIT License.
//--------------------------------------------------------------------- */
/*!
\file SnifferRules.h
SnifferRules class declarations
*/
#ifndef _MIME_SNIFFER_RULES_H #ifndef _MIME_SNIFFER_RULES_H
#define _MIME_SNIFFER_RULES_H #define _MIME_SNIFFER_RULES_H
#include <SupportDefs.h> #include <SupportDefs.h>
#include <list> #include <list>
#include <string> #include <string>
struct entry_ref; class BFile;
class BString; class BString;
struct entry_ref;
namespace BPrivate { namespace BPrivate {
namespace Storage { namespace Storage {
headers/private/storage/mime/database_support.h
+7 -9
View File
@@ -1,21 +1,19 @@
//---------------------------------------------------------------------- /*
// This software is part of the OpenBeOS distribution and is covered * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
// by the OpenBeOS license. * Distributed under the terms of the MIT License.
//--------------------------------------------------------------------- */
/*!
\file database_support.h
Private mime database function and constant declarations
*/
#ifndef _MIME_DATABASE_SUPPORT_H #ifndef _MIME_DATABASE_SUPPORT_H
#define _MIME_DATABASE_SUPPORT_H #define _MIME_DATABASE_SUPPORT_H
#include <StorageDefs.h> #include <StorageDefs.h>
#include <string> #include <string>
class BNode; class BNode;
class BMessage; class BMessage;
class BString;
namespace BPrivate { namespace BPrivate {
namespace Storage { namespace Storage {
headers/private/tracker/NavMenu.h
+3 -6
View File
@@ -148,8 +148,8 @@ class BNavMenu : public BSlowMenu {
// Spring Loaded Folder convenience routines // Spring Loaded Folder convenience routines
// used in both Tracker and Deskbar // used in both Tracker and Deskbar
#if B_BEOS_VERSION_DANO #ifndef _IMPEXP_TRACKER
#define _IMPEXP_TRACKER # define _IMPEXP_TRACKER
#endif #endif
_IMPEXP_TRACKER bool SpringLoadedFolderCompareMessages(const BMessage *incoming, _IMPEXP_TRACKER bool SpringLoadedFolderCompareMessages(const BMessage *incoming,
const BMessage *dragmessage); const BMessage *dragmessage);
@@ -159,12 +159,9 @@ _IMPEXP_TRACKER void SpringLoadedFolderAddUniqueTypeToList(entry_ref *ref,
BObjectList<BString> *typeslist); BObjectList<BString> *typeslist);
_IMPEXP_TRACKER void SpringLoadedFolderCacheDragData(const BMessage *incoming, _IMPEXP_TRACKER void SpringLoadedFolderCacheDragData(const BMessage *incoming,
BMessage **, BObjectList<BString> **typeslist); BMessage **, BObjectList<BString> **typeslist);
#if B_BEOS_VERSION_DANO
#undef _IMPEXP_TRACKER
#endif
} // namespace BPrivate } // namespace BPrivate
using namespace BPrivate; using namespace BPrivate;
#endif #endif // NAV_MENU_H
headers/private/tracker/tracker_private.h
+1 -1
View File
@@ -43,7 +43,7 @@ All rights reserved.
namespace BPrivate { namespace BPrivate {
#if !B_BEOS_VERSION_DANO #ifdef _IMPEXP_TRACKER
_IMPEXP_TRACKER _IMPEXP_TRACKER
#endif #endif
void InitIconPreloader(); void InitIconPreloader();
src/add-ons/accelerants/common/create_display_modes.cpp
+1
View File
@@ -204,6 +204,7 @@ ModeList::AddModes(edid1_info* info)
if (info->detailed_monitor[i].monitor_desc_type != EDID1_IS_DETAILED_TIMING) if (info->detailed_monitor[i].monitor_desc_type != EDID1_IS_DETAILED_TIMING)
continue; continue;
// TODO: handle sync and flags correctly!
const edid1_detailed_timing& timing = info->detailed_monitor[i].data.detailed_timing; const edid1_detailed_timing& timing = info->detailed_monitor[i].data.detailed_timing;
display_mode mode; display_mode mode;
mode.timing.pixel_clock = timing.pixel_clock * 10; mode.timing.pixel_clock = timing.pixel_clock * 10;
src/add-ons/media/media-add-ons/dvb/DVBMediaNode.h
+7 -8
View File
@@ -21,11 +21,11 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef __DVB_MEDIA_NODE_H #ifndef __DVB_MEDIA_NODE_H
#define __DVB_MEDIA_NODE_H #define __DVB_MEDIA_NODE_H
#include <kernel/OS.h>
#include <OS.h>
#include <media/BufferProducer.h> #include <media/BufferProducer.h>
#include <media/Controllable.h> #include <media/Controllable.h>
#include <media/MediaDefs.h> #include <media/MediaDefs.h>
@@ -39,14 +39,13 @@
#include "StringList.h" #include "StringList.h"
class BDiscreteParameter; class BDiscreteParameter;
class BParameterGroup;
class PacketQueue; class PacketQueue;
class DVBCard; class DVBCard;
class DVBMediaNode :
public virtual BBufferProducer, class DVBMediaNode : public virtual BBufferProducer,
public virtual BControllable, public virtual BControllable, public virtual BMediaEventLooper {
public virtual BMediaEventLooper
{
public: public:
DVBMediaNode(BMediaAddOn *addon, DVBMediaNode(BMediaAddOn *addon,
const char *name, int32 internal_id, DVBCard *card); const char *name, int32 internal_id, DVBCard *card);
@@ -287,4 +286,4 @@ private:
int fRawAudioFile; int fRawAudioFile;
}; };
#endif #endif // __DVB_MEDIA_NODE_H
src/add-ons/media/media-add-ons/mixer/MixerSettings.h
+6 -5
View File
@@ -5,16 +5,18 @@
#ifndef _MIXER_SETTINGS_H #ifndef _MIXER_SETTINGS_H
#define _MIXER_SETTINGS_H #define _MIXER_SETTINGS_H
#include <Message.h> #include <Message.h>
#include <Path.h> #include <Path.h>
class BLocker;
class MixerInput; class MixerInput;
class MixerOutput; class MixerOutput;
#define MAX_INPUT_SETTINGS 50 #define MAX_INPUT_SETTINGS 50
class MixerSettings class MixerSettings {
{
public: public:
MixerSettings(); MixerSettings();
~MixerSettings(); ~MixerSettings();
@@ -72,8 +74,7 @@ class MixerSettings
volatile sem_id fSaveThreadWaitSem; volatile sem_id fSaveThreadWaitSem;
volatile bool fSaveThreadRunning; volatile bool fSaveThreadRunning;
struct settings struct settings {
{
bool AttenuateOutput; bool AttenuateOutput;
bool NonLinearGainSlider; bool NonLinearGainSlider;
bool UseBalanceControl; bool UseBalanceControl;
@@ -91,4 +92,4 @@ class MixerSettings
BMessage fInputSetting[MAX_INPUT_SETTINGS]; BMessage fInputSetting[MAX_INPUT_SETTINGS];
}; };
#endif #endif // _MIXER_SETTINGS_H
src/add-ons/media/media-add-ons/usb_webcam/CamDevice.h
+21 -20
View File
@@ -1,20 +1,30 @@
#ifndef _CAM_DEVICE_H #ifndef _CAM_DEVICE_H
#define _CAM_DEVICE_H #define _CAM_DEVICE_H
#include <OS.h> #include <OS.h>
#include <image.h> #include <image.h>
#ifdef __HAIKU__ #ifdef __HAIKU__
# include <USB3.h> # include <USB3.h>
# include <USBKit.h> # include <USBKit.h>
#else #else
# include <USB.h> # include <USB.h>
# include <usb/USBKit.h> # include <usb/USBKit.h>
#endif #endif
#include <Locker.h> #include <Locker.h>
#include <MediaAddOn.h> #include <MediaAddOn.h>
#include <String.h> #include <String.h>
#include <Rect.h> #include <Rect.h>
class BBitmap;
class BBuffer;
class BDataIO;
class CamRoster;
class CamDeviceAddon;
class CamSensor;
class CamDeframer;
class WebCamMediaAddOn;
typedef struct { typedef struct {
usb_support_descriptor desc; usb_support_descriptor desc;
@@ -22,17 +32,8 @@ typedef struct {
const char *product; const char *product;
} usb_named_support_descriptor; } usb_named_support_descriptor;
class CamRoster;
class CamDeviceAddon;
class CamSensor;
class CamDeframer;
class WebCamMediaAddOn;
class BBitmap;
class BBuffer;
// This class represents each webcam // This class represents each webcam
class CamDevice class CamDevice {
{
public: public:
CamDevice(CamDeviceAddon &_addon, BUSBDevice* _device); CamDevice(CamDeviceAddon &_addon, BUSBDevice* _device);
virtual ~CamDevice(); virtual ~CamDevice();
@@ -109,7 +110,7 @@ class CamDevice
const BUSBEndpoint* fBulkIn; const BUSBEndpoint* fBulkIn;
private: private:
friend class CamDeviceAddon; friend class CamDeviceAddon;
CamDeviceAddon& fCamDeviceAddon; CamDeviceAddon& fCamDeviceAddon;
BUSBDevice* fDevice; BUSBDevice* fDevice;
int fSupportedDeviceIndex; int fSupportedDeviceIndex;
@@ -124,8 +125,7 @@ friend class CamDeviceAddon;
// the addon itself, that instanciate // the addon itself, that instanciate
class CamDeviceAddon class CamDeviceAddon {
{
public: public:
CamDeviceAddon(WebCamMediaAddOn* webcam); CamDeviceAddon(WebCamMediaAddOn* webcam);
virtual ~CamDeviceAddon(); virtual ~CamDeviceAddon();
@@ -135,7 +135,8 @@ class CamDeviceAddon
virtual CamDevice* Instantiate(CamRoster &roster, BUSBDevice *from); virtual CamDevice* Instantiate(CamRoster &roster, BUSBDevice *from);
void SetSupportedDevices(const usb_named_support_descriptor *devs); void SetSupportedDevices(const usb_named_support_descriptor *devs);
const usb_named_support_descriptor* SupportedDevices() const { return fSupportedDevices; }; const usb_named_support_descriptor* SupportedDevices() const
{ return fSupportedDevices; };
WebCamMediaAddOn* WebCamAddOn() const { return fWebCamAddOn; }; WebCamMediaAddOn* WebCamAddOn() const { return fWebCamAddOn; };
private: private:
@@ -148,8 +149,8 @@ class CamDeviceAddon
get_webcam_addon_##modname get_webcam_addon_##modname
// external addons -- UNIMPLEMENTED // external addons -- UNIMPLEMENTED
extern "C" status_t get_webcam_addon(WebCamMediaAddOn* webcam, CamDeviceAddon **addon); extern "C" status_t get_webcam_addon(WebCamMediaAddOn* webcam,
CamDeviceAddon **addon);
#define B_WEBCAM_ADDON_INSTANTIATION_FUNC_NAME "get_webcam_addon" #define B_WEBCAM_ADDON_INSTANTIATION_FUNC_NAME "get_webcam_addon"
#endif // _CAM_DEVICE_H #endif // _CAM_DEVICE_H
src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.h
+11 -8
View File
@@ -25,18 +25,21 @@
#ifndef _FALLBACK_INDEX_H #ifndef _FALLBACK_INDEX_H
#define _FALLBACK_INDEX_H #define _FALLBACK_INDEX_H
#include "Index.h" #include "Index.h"
class FallbackIndex : public Index
{ class FallbackIndex : public Index {
public: public:
FallbackIndex(BPositionIO *source, OpenDMLParser *parser); FallbackIndex(BPositionIO *source, OpenDMLParser *parser);
~FallbackIndex(); ~FallbackIndex();
status_t Init(); status_t Init();
status_t GetNextChunkInfo(int stream_index, int64 *start, uint32 *size, bool *keyframe); status_t GetNextChunkInfo(int stream_index, int64 *start,
status_t Seek(int stream_index, uint32 seekTo, int64 *frame, bigtime_t *time); uint32 *size, bool *keyframe);
status_t Seek(int stream_index, uint32 seekTo, int64 *frame,
bigtime_t *time);
}; };
#endif #endif // _FALLBACK_INDEX_H
src/add-ons/media/plugins/avi_reader/libOpenDML/Index.h
+11 -5
View File
@@ -25,22 +25,28 @@
#ifndef _INDEX_H #ifndef _INDEX_H
#define _INDEX_H #define _INDEX_H
#include <SupportDefs.h>
class BPositionIO;
class OpenDMLParser; class OpenDMLParser;
class Index
{ class Index {
public: public:
Index(BPositionIO *source, OpenDMLParser *parser); Index(BPositionIO *source, OpenDMLParser *parser);
virtual ~Index(); virtual ~Index();
virtual status_t Init() = 0; virtual status_t Init() = 0;
virtual status_t GetNextChunkInfo(int stream_index, int64 *start, uint32 *size, bool *keyframe) = 0; virtual status_t GetNextChunkInfo(int stream_index, int64 *start,
virtual status_t Seek(int stream_index, uint32 seekTo, int64 *frame, bigtime_t *time) = 0; uint32 *size, bool *keyframe) = 0;
virtual status_t Seek(int stream_index, uint32 seekTo, int64 *frame,
bigtime_t *time) = 0;
protected: protected:
BPositionIO * fSource; BPositionIO * fSource;
OpenDMLParser * fParser; OpenDMLParser * fParser;
}; };
#endif #endif // _INDEX_H
src/add-ons/media/plugins/ogg/OggReaderPlugin.h
+6 -5
View File
@@ -3,9 +3,12 @@
#include "ReaderPlugin.h" #include "ReaderPlugin.h"
#include "ogg/ogg.h" #include "ogg/ogg.h"
#include <map> #include <map>
#include <vector> #include <vector>
class BFile;
namespace BPrivate { namespace media { namespace BPrivate { namespace media {
class OggTrack; class OggTrack;
@@ -13,8 +16,7 @@ class OggTrack;
typedef std::map<long,OggTrack*> serialno_OggTrack_map; typedef std::map<long,OggTrack*> serialno_OggTrack_map;
typedef std::vector<long> serialno_vector; typedef std::vector<long> serialno_vector;
class OggReader : public Reader class OggReader : public Reader {
{
public: public:
OggReader(); OggReader();
~OggReader(); ~OggReader();
@@ -59,8 +61,7 @@ public:
}; };
}; };
class OggReaderPlugin : public ReaderPlugin class OggReaderPlugin : public ReaderPlugin {
{
public: public:
Reader *NewReader(); Reader *NewReader();
}; };
@@ -69,4 +70,4 @@ public:
using namespace BPrivate::media; using namespace BPrivate::media;
#endif #endif // _OGG_READER_PLUGIN_H
src/apps/codycam/SettingsHandler.h
+1
View File
@@ -9,6 +9,7 @@
class BFile; class BFile;
class BDirectory; class BDirectory;
class BRect;
class Settings; class Settings;
src/apps/cortex/DiagramView/DiagramItem.h
+1
View File
@@ -19,6 +19,7 @@
#include <InterfaceDefs.h> #include <InterfaceDefs.h>
#include <Region.h> #include <Region.h>
class BMessage;
class BView; class BView;
#include "cortex_defs.h" #include "cortex_defs.h"
src/apps/cortex/InfoView/DormantNodeInfoView.h
+4
View File
@@ -16,6 +16,10 @@
#include "InfoView.h" #include "InfoView.h"
#include "cortex_defs.h" #include "cortex_defs.h"
struct dormant_node_info;
__BEGIN_CORTEX_NAMESPACE __BEGIN_CORTEX_NAMESPACE
class NodeRef; class NodeRef;
src/apps/cortex/InfoView/InfoWindowManager.h
+7 -2
View File
@@ -13,15 +13,20 @@
#ifndef __InfoWindowManager_H__ #ifndef __InfoWindowManager_H__
#define __InfoWindowManager_H__ #define __InfoWindowManager_H__
// Application Kit
#include <Looper.h> #include <Looper.h>
// Interface Kit
#include <Point.h> #include <Point.h>
class BList; class BList;
class BWindow; class BWindow;
#include "cortex_defs.h" #include "cortex_defs.h"
struct dormant_node_info;
struct media_destination;
struct media_input;
struct media_output;
struct media_source;
__BEGIN_CORTEX_NAMESPACE __BEGIN_CORTEX_NAMESPACE
class Connection; class Connection;
src/apps/cortex/ParameterView/ParameterWindow.h
+1
View File
@@ -26,6 +26,7 @@
// Media Kit // Media Kit
#include <MediaNode.h> #include <MediaNode.h>
class BMediaTheme;
class BMessenger; class BMessenger;
#include "cortex_defs.h" #include "cortex_defs.h"
src/apps/cortex/Persistence/ExportContext.h
+13 -19
View File
@@ -20,40 +20,35 @@
#include "cortex_defs.h" #include "cortex_defs.h"
__BEGIN_CORTEX_NAMESPACE __BEGIN_CORTEX_NAMESPACE
class BDataIO;
class IPersistent; class IPersistent;
class ExportContext; class ExportContext;
// writeAttr() helper // writeAttr() helper
inline BString& _pad_with_spaces( inline BString& _pad_with_spaces(BString& out, const char* text,
BString& out, ExportContext& context, uint16 column);
const char* text,
ExportContext& context,
uint16 column);
class ExportContext { class ExportContext {
public: // *** ctor/dtor public:
virtual ~ExportContext();
ExportContext(); ExportContext();
ExportContext( ExportContext(BDataIO* stream);
BDataIO* _stream); virtual ~ExportContext();
public: // *** public members
// the output stream // the output stream
BDataIO* stream; BDataIO* stream;
// the element stack // the element stack
struct element_entry { struct element_entry {
element_entry() : hasAttributes(false), hasContent(false) {} element_entry() : hasAttributes(false), hasContent(false) {}
BString name; BString name;
bool hasAttributes; bool hasAttributes;
bool hasContent; bool hasContent;
}; };
typedef std::list<element_entry> element_list; typedef std::list<element_entry> element_list;
element_list m_elementStack; element_list m_elementStack;
public: // *** XML formatting helpers public: // *** XML formatting helpers
@@ -61,8 +56,7 @@ public: // *** XML formatting helpers
// IPersistent::xmlExportBegin() // IPersistent::xmlExportBegin()
// (or xmlExportContent(), if you're writing nested elements) // (or xmlExportContent(), if you're writing nested elements)
void beginElement( void beginElement(const char* name);
const char* name);
// writes an end tag corresponding to the current element. // writes an end tag corresponding to the current element.
// should only be called from IPersistent::xmlExportEnd() or // should only be called from IPersistent::xmlExportEnd() or
src/apps/cortex/RouteApp/RouteWindow.h
+3
View File
@@ -21,6 +21,9 @@
#include "IStateArchivable.h" #include "IStateArchivable.h"
#include "cortex_defs.h" #include "cortex_defs.h"
class BMenu;
__BEGIN_CORTEX_NAMESPACE __BEGIN_CORTEX_NAMESPACE
class MediaRoutingView; class MediaRoutingView;
src/apps/cortex/TransportView/TransportView.h
+1
View File
@@ -15,6 +15,7 @@
#include <PopUpMenu.h> #include <PopUpMenu.h>
class BButton; class BButton;
class BInvoker;
class BStringView; class BStringView;
class BTextControl; class BTextControl;
class BMenuField; class BMenuField;
src/apps/cortex/support/MediaIcon.h
+1
View File
@@ -28,6 +28,7 @@
#include <Mime.h> #include <Mime.h>
class BRegion; class BRegion;
struct dormant_flavor_info;
#include "cortex_defs.h" #include "cortex_defs.h"
__BEGIN_CORTEX_NAMESPACE __BEGIN_CORTEX_NAMESPACE
src/apps/diskprobe/DataEditor.h
+2 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2004-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef DATA_EDITOR_H #ifndef DATA_EDITOR_H
@@ -13,6 +13,7 @@
class BHandler; class BHandler;
class BLooper; class BLooper;
class BMessage;
class BMessenger; class BMessenger;
class DataChange; class DataChange;
src/apps/installer/FSUtils.cpp
+1 -11
View File
@@ -2876,11 +2876,7 @@ _TrackerLaunchAppWithDocuments(const entry_ref *appRef, const BMessage *refs, bo
} }
extern "C" char** environ; extern "C" char** environ;
extern "C" extern "C" status_t _kload_image_etc_(int argc, char **argv, char **envp,
#if !B_BEOS_VERSION_DANO
_IMPEXP_ROOT
#endif
status_t _kload_image_etc_(int argc, char **argv, char **envp,
char *buf, int bufsize); char *buf, int bufsize);
@@ -3103,9 +3099,6 @@ LaunchBrokenLink(const char *signature, const BMessage *refs)
// external launch calls; need to be robust, work if Tracker is not running // external launch calls; need to be robust, work if Tracker is not running
#if !B_BEOS_VERSION_DANO
_IMPEXP_TRACKER
#endif
status_t status_t
FSLaunchItem(const entry_ref *application, const BMessage *refsReceived, FSLaunchItem(const entry_ref *application, const BMessage *refsReceived,
bool async, bool openWithOK) bool async, bool openWithOK)
@@ -3114,9 +3107,6 @@ FSLaunchItem(const entry_ref *application, const BMessage *refsReceived,
} }
#if !B_BEOS_VERSION_DANO
_IMPEXP_TRACKER
#endif
status_t status_t
FSOpenWith(BMessage *listOfRefs) FSOpenWith(BMessage *listOfRefs)
{ {
src/apps/installer/FSUtils.h
+25 -28
View File
@@ -145,26 +145,23 @@ TrackerCopyLoopControl::TrackerCopyLoopControl(thread_id thread)
#define B_DESKTOP_DIR_NAME "Desktop" #define B_DESKTOP_DIR_NAME "Desktop"
#if B_BEOS_VERSION_DANO status_t FSCopyAttributesAndStats(BNode *, BNode *);
#define _IMPEXP_TRACKER
#endif
_IMPEXP_TRACKER status_t FSCopyAttributesAndStats(BNode *, BNode *);
_IMPEXP_TRACKER status_t FSCopyFile(BEntry* srcFile, StatStruct *srcStat, BDirectory* destDir, status_t FSCopyFile(BEntry* srcFile, StatStruct *srcStat, BDirectory* destDir,
CopyLoopControl *loopControl, BPoint *loc, bool makeOriginalName, Undo &undo); CopyLoopControl *loopControl, BPoint *loc, bool makeOriginalName, Undo &undo);
_IMPEXP_TRACKER status_t FSCopyFolder(BEntry *srcEntry, BDirectory *destDir, CopyLoopControl *loopControl, status_t FSCopyFolder(BEntry *srcEntry, BDirectory *destDir, CopyLoopControl *loopControl,
BPoint *loc, bool makeOriginalName, Undo &undo); BPoint *loc, bool makeOriginalName, Undo &undo);
_IMPEXP_TRACKER void FSDuplicate(BObjectList<entry_ref> *srcList, BList *pointList); void FSDuplicate(BObjectList<entry_ref> *srcList, BList *pointList);
_IMPEXP_TRACKER void FSMoveToFolder(BObjectList<entry_ref> *srcList, BEntry *, uint32 moveMode, void FSMoveToFolder(BObjectList<entry_ref> *srcList, BEntry *, uint32 moveMode,
BList *pointList = NULL); BList *pointList = NULL);
_IMPEXP_TRACKER void FSMakeOriginalName(char *name, BDirectory *destDir, const char *suffix); void FSMakeOriginalName(char *name, BDirectory *destDir, const char *suffix);
_IMPEXP_TRACKER bool FSIsTrashDir(const BEntry *); bool FSIsTrashDir(const BEntry *);
_IMPEXP_TRACKER bool FSIsPrintersDir(const BEntry *); bool FSIsPrintersDir(const BEntry *);
_IMPEXP_TRACKER bool FSIsDeskDir(const BEntry *); bool FSIsDeskDir(const BEntry *);
_IMPEXP_TRACKER bool FSIsSystemDir(const BEntry *); bool FSIsSystemDir(const BEntry *);
_IMPEXP_TRACKER bool FSIsBeOSDir(const BEntry *); bool FSIsBeOSDir(const BEntry *);
_IMPEXP_TRACKER bool FSIsHomeDir(const BEntry *); bool FSIsHomeDir(const BEntry *);
_IMPEXP_TRACKER void FSMoveToTrash(BObjectList<entry_ref> *srcList, BList *pointList = NULL, void FSMoveToTrash(BObjectList<entry_ref> *srcList, BList *pointList = NULL,
bool async = true); bool async = true);
// Deprecated // Deprecated
@@ -172,23 +169,23 @@ void FSDeleteRefList(BObjectList<entry_ref> *, bool, bool confirm = true);
void FSDelete(entry_ref *, bool, bool confirm = true); void FSDelete(entry_ref *, bool, bool confirm = true);
void FSRestoreRefList(BObjectList<entry_ref> *list, bool async); void FSRestoreRefList(BObjectList<entry_ref> *list, bool async);
_IMPEXP_TRACKER status_t FSLaunchItem(const entry_ref *application, const BMessage *refsReceived, status_t FSLaunchItem(const entry_ref *application, const BMessage *refsReceived,
bool async, bool openWithOK); bool async, bool openWithOK);
// Preferred way of launching; only pass an actual application in <application>, not // Preferred way of launching; only pass an actual application in <application>, not
// a document; to open documents with the preferred app, pase 0 in <application> and // a document; to open documents with the preferred app, pase 0 in <application> and
// stuff all the document refs into <refsReceived> // stuff all the document refs into <refsReceived>
// Consider having silent mode that does not show alerts, just returns error code // Consider having silent mode that does not show alerts, just returns error code
_IMPEXP_TRACKER status_t FSOpenWith(BMessage *listOfRefs); status_t FSOpenWith(BMessage *listOfRefs);
// runs the Open With window; pas a list of refs // runs the Open With window; pas a list of refs
_IMPEXP_TRACKER void FSEmptyTrash(); void FSEmptyTrash();
_IMPEXP_TRACKER status_t FSCreateNewFolderIn(const node_ref *destDir, entry_ref *newRef, status_t FSCreateNewFolderIn(const node_ref *destDir, entry_ref *newRef,
node_ref *new_node); node_ref *new_node);
_IMPEXP_TRACKER void FSCreateTrashDirs(); void FSCreateTrashDirs();
_IMPEXP_TRACKER status_t FSGetTrashDir(BDirectory *trashDir, dev_t volume); status_t FSGetTrashDir(BDirectory *trashDir, dev_t volume);
_IMPEXP_TRACKER status_t FSGetDeskDir(BDirectory *deskDir, dev_t volume); status_t FSGetDeskDir(BDirectory *deskDir, dev_t volume);
_IMPEXP_TRACKER status_t FSRecursiveCalcSize(BInfoWindow *, BDirectory *, status_t FSRecursiveCalcSize(BInfoWindow *, BDirectory *,
off_t *runningSize, int32 *fileCount, int32 *dirCount); off_t *runningSize, int32 *fileCount, int32 *dirCount);
bool FSInTrashDir(const entry_ref *); bool FSInTrashDir(const entry_ref *);
@@ -236,12 +233,12 @@ bool ConfirmChangeIfWellKnownDirectory(const BEntry *entry, const char *action,
bool dontAsk = false, int32 *confirmedAlready = NULL); bool dontAsk = false, int32 *confirmedAlready = NULL);
// Deprecated calls use newer calls above instead // Deprecated calls use newer calls above instead
_IMPEXP_TRACKER void FSLaunchItem(const entry_ref *, BMessage * = NULL, int32 workspace = -1); void FSLaunchItem(const entry_ref *, BMessage * = NULL, int32 workspace = -1);
_IMPEXP_TRACKER status_t FSLaunchItem(const entry_ref *, BMessage *, status_t FSLaunchItem(const entry_ref *, BMessage *,
int32 workspace, bool asynch); int32 workspace, bool asynch);
_IMPEXP_TRACKER void FSOpenWithDocuments(const entry_ref *executableToLaunch, void FSOpenWithDocuments(const entry_ref *executableToLaunch,
BMessage *documentEntryRefs); BMessage *documentEntryRefs);
_IMPEXP_TRACKER status_t FSLaunchUsing(const entry_ref *ref, BMessage *listOfRefs); status_t FSLaunchUsing(const entry_ref *ref, BMessage *listOfRefs);
// some extra directory_which values // some extra directory_which values
src/apps/mail/ComboBox.h
+2 -1
View File
@@ -46,10 +46,11 @@ All rights reserved.
#include <View.h> #include <View.h>
class BButton; class BButton;
class BComboBox;
class BList; class BList;
class BTextControl; class BTextControl;
class BTextView;
class BWindow; class BWindow;
class BComboBox;
struct text_run_array; struct text_run_array;
typedef const char* (*text_input_filter_hook)(const char* inText, int32& length, typedef const char* (*text_input_filter_hook)(const char* inText, int32& length,
src/apps/mail/Header.h
+3 -2
View File
@@ -78,12 +78,13 @@ All rights reserved.
#define BCC_FIELD_WIDTH 197 #define BCC_FIELD_WIDTH 197
#define BCC_FIELD_HEIGHT 16 #define BCC_FIELD_HEIGHT 16
class TTextControl;
class BFile; class BFile;
class BMenuField; class BMenuField;
class BMenuItem; class BMenuItem;
class BPopupMenu; class BPopUpMenu;
class BStringView;
class QPopupMenu; class QPopupMenu;
class TTextControl;
class THeaderView : public BBox { class THeaderView : public BBox {
src/apps/mail/MailSupport.h
+1
View File
@@ -60,6 +60,7 @@ enum WINDOW_TYPES {
class BFile; class BFile;
class BMenu;
class Words; class Words;
src/apps/mail/MailWindow.h
+1
View File
@@ -57,6 +57,7 @@ class BEmailMessage;
class BFile; class BFile;
class BFilePanel; class BFilePanel;
class BMailMessage; class BMailMessage;
class BMenu;
class BMenuBar; class BMenuBar;
class BMenuItem; class BMenuItem;
class BmapButton; class BmapButton;
src/apps/mail/Prefs.h
+8 -13
View File
@@ -31,19 +31,19 @@ of Be Incorporated in the United States and other countries. Other brand product
names are registered trademarks or trademarks of their respective holders. names are registered trademarks or trademarks of their respective holders.
All rights reserved. All rights reserved.
*/ */
//--------------------------------------------------------------------
//
// Prefs.h
//
//--------------------------------------------------------------------
#ifndef _PREFS_H #ifndef _PREFS_H
#define _PREFS_H #define _PREFS_H
#include <Font.h> #include <Font.h>
#include <Window.h> #include <Window.h>
class BButton;
class BMenu;
class BPopUpMenu;
class BTextControl;
#define ACCOUNT_USE_DEFAULT 0 #define ACCOUNT_USE_DEFAULT 0
#define ACCOUNT_FROM_MAIL 1 #define ACCOUNT_FROM_MAIL 1
@@ -53,8 +53,7 @@ All rights reserved.
#define SIG_NONE MDR_DIALECT_CHOICE ("None", "無し") #define SIG_NONE MDR_DIALECT_CHOICE ("None", "無し")
#define SIG_RANDOM MDR_DIALECT_CHOICE ("Random", "自動選択") #define SIG_RANDOM MDR_DIALECT_CHOICE ("Random", "自動選択")
struct EncodingItem struct EncodingItem {
{
char *name; char *name;
uint32 flavor; uint32 flavor;
}; };
@@ -62,10 +61,6 @@ struct EncodingItem
extern const EncodingItem kEncodings[]; extern const EncodingItem kEncodings[];
class Button;
//====================================================================
class TPrefsWindow : public BWindow { class TPrefsWindow : public BWindow {
public: public:
TPrefsWindow(BRect rect, BFont *font, int32 *level, bool *warp, TPrefsWindow(BRect rect, BFont *font, int32 *level, bool *warp,
src/apps/mail/QueryMenu.h
+2 -1
View File
@@ -31,10 +31,10 @@ of Be Incorporated in the United States and other countries. Other brand product
names are registered trademarks or trademarks of their respective holders. names are registered trademarks or trademarks of their respective holders.
All rights reserved. All rights reserved.
*/ */
#ifndef _QUERY_MENU #ifndef _QUERY_MENU
#define _QUERY_MENU #define _QUERY_MENU
#include <Locker.h> #include <Locker.h>
#include <PopUpMenu.h> #include <PopUpMenu.h>
@@ -44,6 +44,7 @@ class BLooper;
class BQuery; class BQuery;
class BVolume; class BVolume;
class QHandler; class QHandler;
struct entry_ref;
using std::vector; using std::vector;

Some files were not shown because too many files have changed in this diff Show More