Author: aljen Date: 2009-12-08 23:27:53 +0100 (Tue, 08 Dec 2009) New Revision: 34569 Changeset: http://dev.haiku-os.org/changeset/34569/haiku Added: haiku/branches/components/gallium3d/data/catalogs/preferences/touchpad/ haiku/branches/components/gallium3d/data/system/data/KeyboardLayouts/TypeMatrix 2030 haiku/branches/components/gallium3d/docs/userguide/en/preferences/deskbar.html haiku/branches/components/gallium3d/headers/private/kernel/kernel_c++_structs.h haiku/branches/components/gallium3d/headers/private/kernel/util/AVLTree.h haiku/branches/components/gallium3d/headers/private/kernel/util/AVLTreeBase.h haiku/branches/components/gallium3d/headers/private/kernel/util/kernel_c.h haiku/branches/components/gallium3d/headers/private/kernel/vm/ haiku/branches/components/gallium3d/headers/private/kernel/vm/VMAddressSpace.h haiku/branches/components/gallium3d/headers/private/kernel/vm/VMArea.h haiku/branches/components/gallium3d/headers/private/kernel/vm/VMCache.h haiku/branches/components/gallium3d/headers/private/kernel/vm/vm.h haiku/branches/components/gallium3d/headers/private/kernel/vm/vm_page.h haiku/branches/components/gallium3d/headers/private/kernel/vm/vm_priv.h haiku/branches/components/gallium3d/headers/private/kernel/vm/vm_translation_map.h haiku/branches/components/gallium3d/headers/private/kernel/vm/vm_types.h haiku/branches/components/gallium3d/headers/private/media/ServerInterface.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/ali_hardware.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/ali_hardware.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/ali_multi.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/ali_multi.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/debug.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/driver.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/driver.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/queue.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/util.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/util.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/glue.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_malo.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_malo.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_malo_pci.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_malohal.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_malohal.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_maloioctl.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/opt_malo.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/if_mwl.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/if_mwl_pci.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/if_mwlioctl.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/if_mwlvar.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/mwldiag.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/mwlhal.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/mwlhal.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/mwlreg.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/opt_inet.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/opt_mwl.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/if_ral_pci.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560reg.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560var.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661reg.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661var.h haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/ListSelectionModel.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/ListSelectionModel.h haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/chart/NanotimeChartAxisLegendSource.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/chart/NanotimeChartAxisLegendSource.h haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/WaitObjectsPage.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/WaitObjectsPage.h haiku/branches/components/gallium3d/src/apps/debuganalyzer/util/TimeUtils.h haiku/branches/components/gallium3d/src/kits/media/BufferCache.cpp haiku/branches/components/gallium3d/src/kits/media/BufferCache.h haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/Condvar.h haiku/branches/components/gallium3d/src/servers/media/MediaFilesManager.cpp haiku/branches/components/gallium3d/src/servers/media/MediaFilesManager.h haiku/branches/components/gallium3d/src/servers/media_addon/MediaAddonServer.cpp haiku/branches/components/gallium3d/src/system/kernel/kernel_c++_structs.cpp haiku/branches/components/gallium3d/src/system/kernel/util/AVLTreeBase.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/VMAddressSpace.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/VMAddressSpaceLocking.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/VMAddressSpaceLocking.h haiku/branches/components/gallium3d/src/system/kernel/vm/VMArea.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/VMCache.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/VMKernelAddressSpace.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/VMKernelAddressSpace.h haiku/branches/components/gallium3d/src/system/kernel/vm/VMKernelArea.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/VMKernelArea.h haiku/branches/components/gallium3d/src/system/kernel/vm/VMUserAddressSpace.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/VMUserAddressSpace.h haiku/branches/components/gallium3d/src/system/kernel/vm/VMUserArea.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/VMUserArea.h haiku/branches/components/gallium3d/src/system/libroot/os/arch/generic/ haiku/branches/components/gallium3d/src/system/libroot/os/arch/generic/generic_system_time_nsecs.cpp haiku/branches/components/gallium3d/src/tests/kits/media/soundplayer/Jamfile haiku/branches/components/gallium3d/src/tests/kits/media/soundplayer/SimplePlayerTest.cpp Removed: haiku/branches/components/gallium3d/headers/private/kernel/vm.h haiku/branches/components/gallium3d/headers/private/kernel/vm/VMAddressSpace.h haiku/branches/components/gallium3d/headers/private/kernel/vm/VMArea.h haiku/branches/components/gallium3d/headers/private/kernel/vm/VMCache.h haiku/branches/components/gallium3d/headers/private/kernel/vm/vm.h haiku/branches/components/gallium3d/headers/private/kernel/vm/vm_page.h haiku/branches/components/gallium3d/headers/private/kernel/vm/vm_priv.h haiku/branches/components/gallium3d/headers/private/kernel/vm/vm_translation_map.h haiku/branches/components/gallium3d/headers/private/kernel/vm/vm_types.h haiku/branches/components/gallium3d/headers/private/kernel/vm_address_space.h haiku/branches/components/gallium3d/headers/private/kernel/vm_cache.h haiku/branches/components/gallium3d/headers/private/kernel/vm_page.h haiku/branches/components/gallium3d/headers/private/kernel/vm_priv.h haiku/branches/components/gallium3d/headers/private/kernel/vm_translation_map.h haiku/branches/components/gallium3d/headers/private/kernel/vm_types.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/ali_hardware.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/ali_hardware.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/ali_multi.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/ali_multi.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/debug.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/driver.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/driver.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/queue.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/util.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ali5451/util.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_malo.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_malo.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_malo_pci.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_malohal.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_malohal.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/if_maloioctl.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/opt_malo.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/if_mwl.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/if_mwl_pci.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/if_mwlioctl.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/if_mwlvar.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/mwldiag.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/mwlhal.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/mwlhal.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/mwlreg.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/opt_inet.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/opt_mwl.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/glue.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/ haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/if_ral_pci.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560reg.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560var.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661reg.h haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661var.h haiku/branches/components/gallium3d/src/kits/media/BufferIdCache.cpp haiku/branches/components/gallium3d/src/kits/media/BufferIdCache.h haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/condvar.h haiku/branches/components/gallium3d/src/servers/input/LICENSE haiku/branches/components/gallium3d/src/servers/input/README haiku/branches/components/gallium3d/src/servers/input/install.sh haiku/branches/components/gallium3d/src/servers/media/MMediaFilesManager.cpp haiku/branches/components/gallium3d/src/servers/media/MMediaFilesManager.h haiku/branches/components/gallium3d/src/servers/media/ServerInterface.h haiku/branches/components/gallium3d/src/servers/media_addon/main.cpp haiku/branches/components/gallium3d/src/system/kernel/util/AVLTreeMap.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/vm_address_space.cpp haiku/branches/components/gallium3d/src/system/kernel/vm/vm_cache.cpp haiku/branches/components/gallium3d/src/system/libroot/os/arch/generic/generic_system_time_nsecs.cpp Modified: haiku/branches/components/gallium3d/ haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/dev-perso haiku/branches/components/gallium3d/build/jam/BuildSetup haiku/branches/components/gallium3d/headers/config/types.h haiku/branches/components/gallium3d/headers/libs/alm/Area.h haiku/branches/components/gallium3d/headers/libs/linprog/Constraint.h haiku/branches/components/gallium3d/headers/libs/linprog/LinearSpec.h haiku/branches/components/gallium3d/headers/libs/linprog/Variable.h haiku/branches/components/gallium3d/headers/os/kernel/OS.h haiku/branches/components/gallium3d/headers/os/media/Buffer.h haiku/branches/components/gallium3d/headers/os/media/BufferConsumer.h haiku/branches/components/gallium3d/headers/os/media/BufferGroup.h haiku/branches/components/gallium3d/headers/os/media/MediaFiles.h haiku/branches/components/gallium3d/headers/os/media/SoundPlayer.h haiku/branches/components/gallium3d/headers/os/support/List.h haiku/branches/components/gallium3d/headers/os/support/SupportDefs.h haiku/branches/components/gallium3d/headers/private/kernel/arch/arm/arch_vm.h haiku/branches/components/gallium3d/headers/private/kernel/arch/m68k/arch_vm.h haiku/branches/components/gallium3d/headers/private/kernel/arch/vm_translation_map.h haiku/branches/components/gallium3d/headers/private/kernel/arch/x86/arch_cpu.h haiku/branches/components/gallium3d/headers/private/kernel/condition_variable.h haiku/branches/components/gallium3d/headers/private/kernel/file_cache.h haiku/branches/components/gallium3d/headers/private/kernel/util/AVLTreeMap.h haiku/branches/components/gallium3d/headers/private/kernel/util/DoublyLinkedList.h haiku/branches/components/gallium3d/headers/private/kernel/util/syscall_args.h haiku/branches/components/gallium3d/headers/private/media/DataExchange.h haiku/branches/components/gallium3d/headers/private/media/DormantNodeManager.h haiku/branches/components/gallium3d/headers/private/media/Notifications.h haiku/branches/components/gallium3d/headers/private/media/PortPool.h haiku/branches/components/gallium3d/headers/private/media/SharedBufferList.h haiku/branches/components/gallium3d/headers/private/net/net_datalink.h haiku/branches/components/gallium3d/headers/private/system/system_profiler_defs.h haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/acpi/oshaiku.c haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/ide/emulation.c haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/ide/pio.c haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/scsi/dma_buffer.c haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/scsi/emulation.c haiku/branches/components/gallium3d/src/add-ons/kernel/busses/scsi/ahci/util.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/ac97/ac97.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/atheros/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/atheros/glue.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c haiku/branches/components/gallium3d/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp haiku/branches/components/gallium3d/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp haiku/branches/components/gallium3d/src/add-ons/kernel/network/devices/bluetooth/bluetooth.cpp haiku/branches/components/gallium3d/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp haiku/branches/components/gallium3d/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp haiku/branches/components/gallium3d/src/add-ons/kernel/network/stack/datalink.cpp haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/AudioMixer.h haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/ByteSwap.cpp haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/ByteSwap.h haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerAddOn.h haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerCore.h haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerDebug.h haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerInput.cpp haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerInput.h haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerOutput.cpp haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerSettings.cpp haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerUtils.cpp haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/MixerUtils.h haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/Resampler.cpp haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/Resampler.h haiku/branches/components/gallium3d/src/add-ons/media/media-add-ons/mixer/RtList.h haiku/branches/components/gallium3d/src/add-ons/media/plugins/asf_reader/libasf/asf.c haiku/branches/components/gallium3d/src/add-ons/media/plugins/asf_reader/libasf/parse.c haiku/branches/components/gallium3d/src/add-ons/translators/pcx/PCX.cpp haiku/branches/components/gallium3d/src/add-ons/translators/pcx/PCX.h haiku/branches/components/gallium3d/src/apps/aboutsystem/AboutSystem.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/HeaderView.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/HeaderView.h haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/Jamfile haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/chart/BigtimeChartAxisLegendSource.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/chart/Jamfile haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/GeneralPage.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/Jamfile haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/MainWindow.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/MainWindow.h haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/SchedulingPage.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/SchedulingPage.h haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/TeamsPage.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/ThreadsPage.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/table/TableColumns.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/table/TableColumns.h haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/thread_window/ActivityPage.cpp haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/thread_window/GeneralPage.cpp [... truncated: 196 changed files follow ...] Log: merged changes from trunk r34426-r34568 Property changes on: haiku/branches/components/gallium3d ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk:33410-34425 + /haiku/trunk:33410-34568 Modified: haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/dev-perso =================================================================== --- haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/dev-perso 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/dev-perso 2009-12-08 22:27:53 UTC (rev 34569) @@ -51,7 +51,7 @@ # automagically find them on different machines... -DRLIST="/Data /work $HOME/devel" +DRLIST="$HOME/devel /Data /work /Volumes/Data/devel" PWLIST="/Data /fat32 $HOME" for d in $DRLIST; do test -d $d && DEVROOT=$d && break; @@ -67,7 +67,8 @@ function dev() { if [ $# -lt 1 ]; then - ls $DEVROOT/*/.profile | sed 's,.*/\([^/]*\)/.profile,\1,' + #ls $DEVROOT/*/.profile | sed 's,.*/\([^/]*\)/.profile,\1,' + for f in "$DEVROOT/"*; do test -e "$f/.profile" || continue; echo ${f##*/}; done return 0 fi if [ "x$1" = "x--help" ]; then @@ -116,7 +117,10 @@ esac # source the specific profile file - source .profile + test -f .profile && . .profile + + # if no editor defined, set one + test -z "$EDITOR" -a -z "$SVN_EDITOR" && export EDITOR=vim # make sure the update action is the first found in history. test -d .svn && history -s svn up Modified: haiku/branches/components/gallium3d/build/jam/BuildSetup =================================================================== --- haiku/branches/components/gallium3d/build/jam/BuildSetup 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/build/jam/BuildSetup 2009-12-08 22:27:53 UTC (rev 34569) @@ -389,6 +389,7 @@ [ PrivateHeaders $(DOT) kernel libroot kernel/boot/platform/$(HAIKU_BOOT_PLATFORM) ] [ ArchHeaders $(HAIKU_ARCH) ] + [ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) system kernel ] $(HAIKU_PRIVATE_SYSTEM_HEADERS) ; @@ -486,6 +487,8 @@ } else { switch $(HOST_GCC_MACHINE) { case x86_64-* : HOST_PLATFORM_IS_64_BIT = 1 ; + case i686-apple-darwin10 : + HOST_PLATFORM_IS_64_BIT = 1 ; } } Copied: haiku/branches/components/gallium3d/data/system/data/KeyboardLayouts/TypeMatrix 2030 (from rev 34565, haiku/trunk/data/system/data/KeyboardLayouts/TypeMatrix 2030) =================================================================== --- haiku/branches/components/gallium3d/data/system/data/KeyboardLayouts/TypeMatrix 2030 (rev 0) +++ haiku/branches/components/gallium3d/data/system/data/KeyboardLayouts/TypeMatrix 2030 2009-12-08 22:27:53 UTC (rev 34569) @@ -0,0 +1,17 @@ +name = TypeMatrix 2030 + +# Size shortcuts +default-size = 18,18 +$high = 18,36 +$large = 27,18 +$space = 90,18 + +# Key rows +[ 0,0; :0x01; :0x02+4; :0x34; :0x07+6; :0x22 ] +[ 0,20; :0x11+5; $high:0x1e; :0x17+6; :0x99 ] +[ 0,38; :0x26+5; :-; :0x2c+6; :0x99 ] +[ 0,56; $high:0x4b; :0x3c+4; $high:0x47; :0x41+5; $high:0x56; :0x3b ] +[ 0,74; :-; :0x4c+4; :-; :0x51+4; :0x33; :-; :0x99 ] +[ 0,92; :0x5c; :0x69; :0x68; :0x99; $space:0x5e; + :0x99; :0x20; :0x57; :0x35; $high:0x60; :0x21 ] +[ 0,110; :0x99; $large:0x66; $large:0x5d; $space:-; :0x5f; :0x61+2; :-; :0x36 ] \ No newline at end of file Copied: haiku/branches/components/gallium3d/docs/userguide/en/preferences/deskbar.html (from rev 34565, haiku/trunk/docs/userguide/en/preferences/deskbar.html) =================================================================== --- haiku/branches/components/gallium3d/docs/userguide/en/preferences/deskbar.html (rev 0) +++ haiku/branches/components/gallium3d/docs/userguide/en/preferences/deskbar.html 2009-12-08 22:27:53 UTC (rev 34569) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "../../../../html-dtd/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US" xml:lang="en-US"> +<head> +<!-- + * + * Copyright 2009, Haiku. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Humdinger <humdingerb@xxxxxxxxx> + * +--> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="robots" content="all" /> + <title>Deskbar</title> + <link rel="stylesheet" type="text/css" href="../../../Haiku-doc.css" /> +</head> +<body> + +<div class="logo"> + <img src="../images/logo.png" alt="logo" class="noprint" id="logo" name="logo" /> +</div> + +<div class="topnav"> + <p> + «  <a href="datatranslations.html">DataTranslations</a> +   ::   + <a href="../preferences.html" class="uplink">Preferences</a> +   ::   + <a href="e-mail.html">E-Mail</a>  » + </p> +</div> + +<div class="content"> + +<h1><img src="../../images/prefs-images/deskbar-icon_64.png" alt="deskbar-icon_64.png" width="64" height="64" />Deskbar</h1> +<table summary="quickinfo" border="0" cellspacing="0" cellpadding="2"> +<tr><td>Deskbar:</td><td style="width:15px;"></td><td><span class="menu">Preferences</span></td></tr> +<tr><td>Location:</td><td></td><td><span class="path">/boot/system/preferences/Deskbar</span></td></tr> + +<tr><td>Settings:</td><td></td><td><span class="path">~/config/settings/Deskbar_settings</span><br /> +<span class="path">~/config/settings/Deskbar_security_code</span></td></tr> +</table> +<p><br /></p> +<p>The Deskbar preference panel is also available from the Deskbar. Its settings are discussed in the topic on <a href="../deskbar.html#deskbar-prefs">Deskbar</a>.</p> + + +</div> + +<!-- +<div class="bottomnav"> + <p> + «  <a href="datatranslations.html">DataTranslations</a> +   ::   + <a href="../preferences.html" class="uplink">Preferences</a> +   ::   + <a href="e-mail.html">E-Mail</a>  » + </p> +</div> +--> + +</body> +</html> Modified: haiku/branches/components/gallium3d/headers/config/types.h =================================================================== --- haiku/branches/components/gallium3d/headers/config/types.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/config/types.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -69,9 +69,9 @@ #define __HAIKU_PRI_PREFIX_64 __HAIKU_STD_PRI_PREFIX_64 #ifdef __HAIKU_ARCH_64_BIT -# define __HAIKU_PRI_PREFIX_ADDR __HAIKU_STD_PRI_PREFIX_64 +# define __HAIKU_PRI_PREFIX_ADDR __HAIKU_PRI_PREFIX_64 #else -# define __HAIKU_PRI_PREFIX_ADDR __HAIKU_STD_PRI_PREFIX_32 +# define __HAIKU_PRI_PREFIX_ADDR __HAIKU_PRI_PREFIX_32 #endif Modified: haiku/branches/components/gallium3d/headers/libs/alm/Area.h =================================================================== --- haiku/branches/components/gallium3d/headers/libs/alm/Area.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/libs/alm/Area.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -29,7 +29,7 @@ * Rectangular area in the GUI, defined by a tab on each side. */ class Area { - + public: XTab* Left() const; void SetLeft(XTab* left); @@ -83,32 +83,32 @@ bool AutoPreferredContentSize() const; void SetAutoPreferredContentSize(bool value); - BString* ToBString(); - const char* ToString(); + operator BString() const; + void GetString(BString& string) const; Constraint* HasSameWidthAs(Area* area); Constraint* HasSameHeightAs(Area* area); BList* HasSameSizeAs(Area* area); ~Area(); - + protected: Area(BALMLayout* ls, XTab* left, YTab* top, - XTab* right, YTab* bottom, - BView* content, + XTab* right, YTab* bottom, + BView* content, BSize minContentSize); - Area(BALMLayout* ls, Row* row, Column* column, + Area(BALMLayout* ls, Row* row, Column* column, BView* content, BSize minContentSize); void DoLayout(); - + private: void InitChildArea(); void UpdateHorizontal(); void UpdateVertical(); - void Init(BALMLayout* ls, XTab* left, YTab* top, - XTab* right, YTab* bottom, - BView* content, + void Init(BALMLayout* ls, XTab* left, YTab* top, + XTab* right, YTab* bottom, + BView* content, BSize minContentSize); public: @@ -152,7 +152,7 @@ Constraint* fTopConstraint; Constraint* fRightConstraint; Constraint* fBottomConstraint; - + public: friend class BALMLayout; Modified: haiku/branches/components/gallium3d/headers/libs/linprog/Constraint.h =================================================================== --- haiku/branches/components/gallium3d/headers/libs/linprog/Constraint.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/libs/linprog/Constraint.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -19,28 +19,28 @@ namespace LinearProgramming { - + class LinearSpec; /** - * Hard linear constraint, i.e. one that must be satisfied. + * Hard linear constraint, i.e. one that must be satisfied. * May render a specification infeasible. */ class Constraint { - + public: - int32 Index(); + int32 Index() const; BList* LeftSide(); void SetLeftSide(BList* summands); void UpdateLeftSide(); void SetLeftSide(double coeff1, Variable* var1); - void SetLeftSide(double coeff1, Variable* var1, + void SetLeftSide(double coeff1, Variable* var1, double coeff2, Variable* var2); - void SetLeftSide(double coeff1, Variable* var1, + void SetLeftSide(double coeff1, Variable* var1, double coeff2, Variable* var2, double coeff3, Variable* var3); - void SetLeftSide(double coeff1, Variable* var1, + void SetLeftSide(double coeff1, Variable* var1, double coeff2, Variable* var2, double coeff3, Variable* var3, double coeff4, Variable* var4); @@ -68,8 +68,8 @@ bool IsValid(); void Invalidate(); - BString* ToBString(); - const char* ToString(); + operator BString() const; + void GetString(BString& string) const; ~Constraint(); Modified: haiku/branches/components/gallium3d/headers/libs/linprog/LinearSpec.h =================================================================== --- haiku/branches/components/gallium3d/headers/libs/linprog/LinearSpec.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/libs/linprog/LinearSpec.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -25,7 +25,7 @@ namespace LinearProgramming { - + class Constraint; class ObjFunctionSummand; class PenaltyFunction; @@ -35,52 +35,52 @@ * Specification of a linear programming problem. */ class LinearSpec { - + public: LinearSpec(); virtual ~LinearSpec(); Variable* AddVariable(); - Constraint* AddConstraint(BList* summands, + Constraint* AddConstraint(BList* summands, OperatorType op, double rightSide); - Constraint* AddConstraint(double coeff1, Variable* var1, + Constraint* AddConstraint(double coeff1, Variable* var1, OperatorType op, double rightSide); - Constraint* AddConstraint(double coeff1, Variable* var1, - double coeff2, Variable* var2, + Constraint* AddConstraint(double coeff1, Variable* var1, + double coeff2, Variable* var2, OperatorType op, double rightSide); Constraint* AddConstraint(double coeff1, Variable* var1, - double coeff2, Variable* var2, - double coeff3, Variable* var3, + double coeff2, Variable* var2, + double coeff3, Variable* var3, OperatorType op, double rightSide); Constraint* AddConstraint(double coeff1, Variable* var1, - double coeff2, Variable* var2, - double coeff3, Variable* var3, - double coeff4, Variable* var4, + double coeff2, Variable* var2, + double coeff3, Variable* var3, + double coeff4, Variable* var4, OperatorType op, double rightSide); - Constraint* AddConstraint(BList* summands, - OperatorType op, double rightSide, + Constraint* AddConstraint(BList* summands, + OperatorType op, double rightSide, double penaltyNeg, double penaltyPos); Constraint* AddConstraint(double coeff1, Variable* var1, - OperatorType op, double rightSide, + OperatorType op, double rightSide, double penaltyNeg, double penaltyPos); Constraint* AddConstraint(double coeff1, Variable* var1, - double coeff2, Variable* var2, - OperatorType op, double rightSide, + double coeff2, Variable* var2, + OperatorType op, double rightSide, double penaltyNeg, double penaltyPos); Constraint* AddConstraint(double coeff1, Variable* var1, - double coeff2, Variable* var2, - double coeff3, Variable* var3, - OperatorType op, double rightSide, + double coeff2, Variable* var2, + double coeff3, Variable* var3, + OperatorType op, double rightSide, double penaltyNeg, double penaltyPos); Constraint* AddConstraint(double coeff1, Variable* var1, - double coeff2, Variable* var2, - double coeff3, Variable* var3, - double coeff4, Variable* var4, - OperatorType op, double rightSide, + double coeff2, Variable* var2, + double coeff3, Variable* var3, + double coeff4, Variable* var4, + OperatorType op, double rightSide, double penaltyNeg, double penaltyPos); - + PenaltyFunction* AddPenaltyFunction(Variable* var, BList* xs, BList* gs); BList* ObjFunction(); @@ -90,7 +90,7 @@ ResultType Presolve(); void RemovePresolved(); ResultType Solve(); - void Save(char* fname); + void Save(const char* fileName); int32 CountColumns() const; OptimizationType Optimization() const; @@ -101,8 +101,8 @@ double ObjectiveValue() const; double SolvingTime() const; - BString* ToBString(); - const char* ToString(); + operator BString() const; + void GetString(BString& string) const; protected: int32 fCountColumns; Modified: haiku/branches/components/gallium3d/headers/libs/linprog/Variable.h =================================================================== --- haiku/branches/components/gallium3d/headers/libs/linprog/Variable.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/libs/linprog/Variable.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -24,7 +24,7 @@ class Variable { public: - int32 Index(); + int32 Index() const; LinearSpec* LS() const; double Value() const; void SetValue(double value); @@ -36,10 +36,10 @@ const char* Label(); void SetLabel(const char* label); - - BString* ToBString(); - const char* ToString(); + operator BString() const; + void GetString(BString& string) const; + Constraint* IsEqual(Variable* var); Constraint* IsSmallerOrEqual(Variable* var); Constraint* IsGreaterOrEqual(Variable* var); Modified: haiku/branches/components/gallium3d/headers/os/kernel/OS.h =================================================================== --- haiku/branches/components/gallium3d/headers/os/kernel/OS.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/os/kernel/OS.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -367,8 +367,9 @@ extern status_t set_timezone(const char *timezone); extern bigtime_t system_time(void); /* time since booting in microseconds */ +extern nanotime_t system_time_nsecs(); + /* time since booting in nanoseconds */ - /* Alarm */ enum { Modified: haiku/branches/components/gallium3d/headers/os/media/Buffer.h =================================================================== --- haiku/branches/components/gallium3d/headers/os/media/Buffer.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/os/media/Buffer.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -9,7 +9,10 @@ #include <MediaDefs.h> -struct _shared_buffer_list; +namespace BPrivate { + class BufferCache; + class SharedBufferList; +} struct buffer_clone_info { @@ -54,8 +57,8 @@ size_t Size(); private: - friend struct _buffer_id_cache; - friend struct _shared_buffer_list; + friend class BPrivate::BufferCache; + friend class BPrivate::SharedBufferList; friend class BMediaRoster; friend class BBufferProducer; friend class BBufferConsumer; @@ -73,15 +76,14 @@ void SetHeader(const media_header* header); media_header fMediaHeader; - _shared_buffer_list* fBufferList; + BPrivate::SharedBufferList* fBufferList; area_id fArea; void* fData; size_t fOffset; size_t fSize; - media_buffer_id fBufferID; int32 fFlags; - uint32 _reserved[11]; + uint32 _reserved[12]; }; Modified: haiku/branches/components/gallium3d/headers/os/media/BufferConsumer.h =================================================================== --- haiku/branches/components/gallium3d/headers/os/media/BufferConsumer.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/os/media/BufferConsumer.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -13,9 +13,9 @@ class BBuffer; class BBufferGroup; class BRegion; -class _buffer_id_cache; namespace BPrivate { + class BufferCache; namespace media { class BMediaRosterEx; } @@ -147,7 +147,7 @@ private: media_type fConsumerType; - _buffer_id_cache* fBufferCache; + BPrivate::BufferCache* fBufferCache; BBufferGroup* fDeleteBufferGroup; uint32 _reserved[14]; }; Modified: haiku/branches/components/gallium3d/headers/os/media/BufferGroup.h =================================================================== --- haiku/branches/components/gallium3d/headers/os/media/BufferGroup.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/os/media/BufferGroup.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -10,7 +10,9 @@ class BBuffer; -struct _shared_buffer_list; +namespace BPrivate { + struct SharedBufferList; +} class BBufferGroup { @@ -53,12 +55,12 @@ status_t _Init(); private: - friend struct _shared_buffer_list; + friend struct BPrivate::SharedBufferList; status_t fInitError; status_t fRequestError; int32 fBufferCount; - _shared_buffer_list* fBufferList; + BPrivate::SharedBufferList* fBufferList; sem_id fReclaimSem; uint32 _reserved[9]; Modified: haiku/branches/components/gallium3d/headers/os/media/MediaFiles.h =================================================================== --- haiku/branches/components/gallium3d/headers/os/media/MediaFiles.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/os/media/MediaFiles.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -40,10 +40,10 @@ virtual status_t RemoveRefFor(const char* type, const char* item, const entry_ref& ref); + virtual status_t RemoveItem(const char* type, const char* item); + static const char B_SOUNDS[]; - virtual status_t RemoveItem(const char* type, const char* item); - // TODO: Needs Perform() for FBC reasons! private: @@ -58,6 +58,9 @@ virtual status_t _Reserved_MediaFiles_6(void*, ...); virtual status_t _Reserved_MediaFiles_7(void*, ...); + void _ClearTypes(); + void _ClearItems(); + private: BList fTypes; int fTypeIndex; Modified: haiku/branches/components/gallium3d/headers/os/media/SoundPlayer.h =================================================================== --- haiku/branches/components/gallium3d/headers/os/media/SoundPlayer.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/os/media/SoundPlayer.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -16,7 +16,9 @@ class BContinuousParameter; class BParameterWeb; class BSound; -class _SoundPlayNode; +namespace BPrivate { + class SoundPlayNode; +} class sound_error : public std::exception { @@ -28,47 +30,40 @@ class BSoundPlayer { - friend class _SoundPlayNode; public: - enum sound_player_notification { - B_STARTED = 1, - B_STOPPED, - B_SOUND_DONE - }; + enum sound_player_notification { + B_STARTED = 1, + B_STOPPED, + B_SOUND_DONE + }; + typedef void (*BufferPlayerFunc)(void*, void* buffer, size_t size, + const media_raw_audio_format& format); + typedef void (*EventNotifierFunc)(void*, sound_player_notification what, + ...); + +public: BSoundPlayer(const char* name = NULL, - void (*PlayBuffer)(void*, void* buffer, - size_t size, - const media_raw_audio_format& format) - = NULL, - void (*Notifier)(void*, - sound_player_notification what, ...) - = NULL, + BufferPlayerFunc playerFunction = NULL, + EventNotifierFunc + eventNotifierFunction = NULL, void* cookie = NULL); BSoundPlayer( const media_raw_audio_format* format, const char* name = NULL, - void (*PlayBuffer)(void*, void* buffer, - size_t size, - const media_raw_audio_format& format) - = NULL, - void (*Notifier)(void*, - sound_player_notification what, ...) - = NULL, + BufferPlayerFunc playerFunction = NULL, + EventNotifierFunc + eventNotifierFunction = NULL, void* cookie = NULL); BSoundPlayer( const media_node& toNode, - const media_multi_audio_format* format - = NULL, + const media_multi_audio_format* + format = NULL, const char* name = NULL, const media_input* input = NULL, - void (*PlayBuffer)(void*, void* buffer, - size_t size, - const media_raw_audio_format& format) - = NULL, - void (*Notifier)(void*, - sound_player_notification what, ...) - = NULL, + BufferPlayerFunc playerFunction = NULL, + EventNotifierFunc + eventNotifierFunction = NULL, void* cookie = NULL); virtual ~BSoundPlayer(); @@ -78,27 +73,20 @@ status_t Start(); void Stop(bool block = true, bool flush = true); - typedef void (*BufferPlayerFunc)(void*, void*, size_t, - const media_raw_audio_format&); - BufferPlayerFunc BufferPlayer() const; void SetBufferPlayer(void (*PlayBuffer)(void*, void* buffer, size_t size, const media_raw_audio_format& format)); - typedef void (*EventNotifierFunc)(void*, sound_player_notification what, - ...); + EventNotifierFunc EventNotifier() const; - void SetNotifier(void (*Notifier)(void*, - sound_player_notification what, ...)); + void SetNotifier( + EventNotifierFunc eventNotifierFunction); void* Cookie() const; void SetCookie(void* cookie); - void SetCallbacks(void (*PlayBuffer)(void*, - void* buffer, size_t size, - const media_raw_audio_format& format) - = NULL, - void (*Notifier)(void*, - sound_player_notification what, ...) - = NULL, + void SetCallbacks( + BufferPlayerFunc playerFunction = NULL, + EventNotifierFunc + eventNotifierFunction = NULL, void* cookie = NULL); typedef int32 play_id; @@ -137,7 +125,7 @@ protected: - void SetInitError(status_t inError); + void SetInitError(status_t error); private: static void _SoundPlayBufferFunc(void* cookie, @@ -154,37 +142,50 @@ virtual status_t _Reserved_SoundPlayer_6(void*, ...); virtual status_t _Reserved_SoundPlayer_7(void*, ...); + void _Init(const media_node* node, + const media_multi_audio_format* format, + const char* name, const media_input* input, + BufferPlayerFunc playerFunction, + EventNotifierFunc eventNotifierFunction, + void* cookie); + void _GetVolumeSlider(); + + void _NotifySoundDone(play_id sound, bool gotToPlay); + + virtual void _Notify(sound_player_notification what, ...); + virtual void _PlayBuffer(void* buffer, size_t size, + const media_raw_audio_format& format); + private: - _SoundPlayNode* fPlayerNode; + friend class BPrivate::SoundPlayNode; - struct _playing_sound { - _playing_sound* next; - off_t current_offset; - BSound* sound; - play_id id; - int32 delta; - int32 rate; - sem_id wait_sem; - float volume; - }; + struct playing_sound { + playing_sound* next; + off_t current_offset; + BSound* sound; + play_id id; + int32 delta; + int32 rate; + sem_id wait_sem; + float volume; + }; - _playing_sound* fPlayingSounds; + struct waiting_sound { + waiting_sound* next; + bigtime_t start_time; + BSound* sound; + play_id id; + int32 rate; + float volume; + }; - struct _waiting_sound { - _waiting_sound* next; - bigtime_t start_time; - BSound* sound; - play_id id; - int32 rate; - float volume; - }; + BPrivate::SoundPlayNode* fPlayerNode; - _waiting_sound* fWaitingSounds; + playing_sound* fPlayingSounds; + waiting_sound* fWaitingSounds; - void (*fPlayBufferFunc)(void* cookie, void* buffer, - size_t size, const media_raw_audio_format& format); - void (*fNotifierFunc)(void* cookie, sound_player_notification what, - ...); + BufferPlayerFunc fPlayBufferFunc; + EventNotifierFunc fNotifierFunc; BLocker fLocker; float fVolumeDB; @@ -201,31 +202,7 @@ bigtime_t fLastVolumeUpdate; BParameterWeb* fParameterWeb; - uint32 _m_reserved[15]; - -private: - void NotifySoundDone(play_id sound, bool gotToPlay); - - void get_volume_slider(); - void Init(const media_node* node, - const media_multi_audio_format* format, - const char* name, - const media_input* input, - void (*PlayBuffer)(void*, void* buffer, - size_t size, - const media_raw_audio_format& format), - void (*Notifier)(void*, - sound_player_notification what, ...), - void* cookie); - // For B_STARTED and B_STOPPED, the argument is BSoundPlayer* (this). - // For B_SOUND_DONE, the arguments are play_id and true/false for - // whether it got to play data at all. - virtual void Notify(sound_player_notification what, - ...); - // Get data into the buffer to play -- this version will use the - // queued BSound system. - virtual void PlayBuffer(void* buffer, size_t size, - const media_raw_audio_format& format); + uint32 _reserved[15]; }; #endif // _SOUND_PLAYER_H Modified: haiku/branches/components/gallium3d/headers/os/support/List.h =================================================================== --- haiku/branches/components/gallium3d/headers/os/support/List.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/os/support/List.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -1,8 +1,8 @@ /* - * Copyright 2001-2007, Haiku, Inc. All Rights Reserved. + * Copyright 2001-2009, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ -#ifndef _BE_LIST_H +#ifndef _BE_LIST_H #define _BE_LIST_H @@ -10,60 +10,70 @@ class BList { - public: - BList(int32 count = 20); - BList(const BList& anotherList); - virtual ~BList(); +public: + BList(int32 count = 20); + BList(const BList& anotherList); + virtual ~BList(); - BList& operator =(const BList &); + BList& operator=(const BList& other); + bool operator==(const BList& other) const; + bool operator!=(const BList& other) const; - /* Adding and removing items. */ - bool AddItem(void* item, int32 index); - bool AddItem(void* item); - bool AddList(const BList* list, int32 index); - bool AddList(const BList* list); - bool RemoveItem(void* item); - void* RemoveItem(int32 index); - bool RemoveItems(int32 index, int32 count); - bool ReplaceItem(int32 index, void* newItem); - void MakeEmpty(); + // Adding and removing items. + bool AddItem(void* item, int32 index); + bool AddItem(void* item); + bool AddList(const BList* list, int32 index); + bool AddList(const BList* list); - // Reorder items - void SortItems(int (*compareFunc)(const void*, const void*)); - bool SwapItems(int32 indexA, int32 indexB); - bool MoveItem(int32 fromIndex, int32 toIndex); + bool RemoveItem(void* item); + void* RemoveItem(int32 index); + bool RemoveItems(int32 index, int32 count); + bool ReplaceItem(int32 index, void* newItem); - // Retrieve items - void* ItemAt(int32 index) const; - void* FirstItem() const; - void* ItemAtFast(int32) const; - // does not check the array bounds! + void MakeEmpty(); - void* LastItem() const; - void* Items() const; + // Reorder items + void SortItems(int (*compareFunc)(const void*, + const void*)); + bool SwapItems(int32 indexA, int32 indexB); + bool MoveItem(int32 fromIndex, int32 toIndex); - // Query - bool HasItem(void* item) const; - int32 IndexOf(void* item) const; - int32 CountItems() const; - bool IsEmpty() const; + // Retrieve items + void* ItemAt(int32 index) const; + void* FirstItem() const; + void* ItemAtFast(int32 index) const; + // does not check the array bounds! - // Iteration - void DoForEach(bool (*func)(void* item)); - void DoForEach(bool (*func)(void* item, void* arg2), void *arg2); + void* LastItem() const; + void* Items() const; - private: - virtual void _ReservedList1(); - virtual void _ReservedList2(); + // Query + bool HasItem(void* item) const; + bool HasItem(const void* item) const; + int32 IndexOf(void* item) const; + int32 IndexOf(const void* item) const; + int32 CountItems() const; + bool IsEmpty() const; - bool _ResizeArray(int32 count); - private: - void** fObjectList; - int32 fPhysicalSize; - int32 fItemCount; - int32 fBlockSize; - int32 fResizeThreshold; - uint32 _reserved[1]; + // Iteration + void DoForEach(bool (*func)(void* item)); + void DoForEach(bool (*func)(void* item, + void* arg2), void* arg2); + +private: + virtual void _ReservedList1(); + virtual void _ReservedList2(); + + bool _ResizeArray(int32 count); + +private: + void** fObjectList; + int32 fPhysicalSize; + int32 fItemCount; + int32 fBlockSize; + int32 fResizeThreshold; + + uint32 _reserved[1]; }; -#endif // _BE_LIST_H +#endif // _BE_LIST_H Modified: haiku/branches/components/gallium3d/headers/os/support/SupportDefs.h =================================================================== --- haiku/branches/components/gallium3d/headers/os/support/SupportDefs.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/os/support/SupportDefs.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -52,6 +52,7 @@ /* descriptive types */ typedef int32 status_t; typedef int64 bigtime_t; +typedef int64 nanotime_t; typedef uint32 type_code; typedef uint32 perform_code; Modified: haiku/branches/components/gallium3d/headers/private/kernel/arch/arm/arch_vm.h =================================================================== --- haiku/branches/components/gallium3d/headers/private/kernel/arch/arm/arch_vm.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/private/kernel/arch/arm/arch_vm.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -5,7 +5,7 @@ #ifndef ARCH_ARM_VM_H #define ARCH_ARM_VM_H -//#include <vm_translation_map.h> +//#include <vm/vm_translation_map.h> /* This many pages will be read/written on I/O if possible */ @@ -22,7 +22,7 @@ status_t (*arch_vm_translation_map_init)(kernel_args *args); status_t (*arch_vm_translation_map_init_post_area)(kernel_args *args); status_t (*arch_vm_translation_map_init_post_sem)(kernel_args *args); - status_t (*arch_vm_translation_map_early_map)(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, + status_t (*arch_vm_translation_map_early_map)(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, uint8 attributes, addr_t (*get_free_page)(kernel_args *)); status_t (*arch_vm_translation_map_early_query)(addr_t va, addr_t *out_physical);*/ // void (*m68k_set_pgdir)(void *); Modified: haiku/branches/components/gallium3d/headers/private/kernel/arch/m68k/arch_vm.h =================================================================== --- haiku/branches/components/gallium3d/headers/private/kernel/arch/m68k/arch_vm.h 2009-12-08 21:47:40 UTC (rev 34568) +++ haiku/branches/components/gallium3d/headers/private/kernel/arch/m68k/arch_vm.h 2009-12-08 22:27:53 UTC (rev 34569) @@ -5,7 +5,7 @@ #ifndef ARCH_M68K_VM_H #define ARCH_M68K_VM_H -#include <vm_translation_map.h> +#include <vm/vm_translation_map.h> /* This many pages will be read/written on I/O if possible */ [... truncated: 67159 lines follow ...]