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

Merge branch 'master' into app_server

Browse Source
This commit is contained in:
Julian Harnath
2015-08-15 11:12:35 +02:00
parent e353fe396a 26cc9e9e07
commit 2a58d5432d
416 changed files with 2223 additions and 109920 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamfile
+2 -1
View File
@@ -26,7 +26,8 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
bash coreutils curl freetype icu libsolv zlib
regular_image @{
bzip2 ctags expat ffmpeg findutils gawk glu grep gutenprint gzip jasper jpeg
bzip2 ctags diffutils expat ffmpeg findutils gawk glu grep gutenprint
gzip jasper jpeg
less libicns libpcap libpng libpng16 libwebp
mesa mesa_devel mesa_swrast
netcat
build/jam/BuildSetup
+5
View File
@@ -594,6 +594,11 @@ if $(HOST_PLATFORM) = freebsd {
if $(HOST_PLATFORM) = darwin {
HOST_HDRS += [ FDirName $(HAIKU_TOP) src build libgnuregex ] ;
# Mac OS X users may be using macports libraries, in which case the headers
# and the libs are located in /opt/local/.
HOST_HDRS += /opt/local/include ;
HOST_LINKFLAGS += -L/opt/local/lib ;
}
HOST_BE_API_HEADERS =
build/jam/images/definitions/minimum
+3 -3
View File
@@ -3,8 +3,8 @@
SYSTEM_BIN = [ FFilterByBuildFeatures
addattr alert arp autologin
bc beep bfsinfo
catattr checkfs checkitout chop clear cmp collectcatkeys compress copyattr
dc desklink df diff diff3 diskimage draggers
catattr checkfs checkitout chop clear collectcatkeys compress copyattr
dc desklink df diskimage draggers
driveinfo dstcheck dumpcatalog
eject error
fdinfo ffm filepanel finddir findpaths fortune fstrim
@@ -24,7 +24,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
query quit
rc reindex release renice resattr rmattr rmindex roster
route
safemode screen_blanker screeninfo screenmode sdiff setarch setmime settype
safemode screen_blanker screeninfo screenmode setarch setmime settype
setversion setvolume shutdown
strace su sysinfo
tcptester telnet telnetd top
build/jam/images/definitions/regular
-5
View File
@@ -255,11 +255,6 @@ AddDirectoryToHaikuImage home config settings printers Preview
AddDirectoryToHaikuImage home config settings printers "Save as PDF"
: home-config-settings-printers-save-as-pdf.rdef ;
# dvb channel settings
#CopyDirectoryToHaikuImage home config settings Media
# : [ FDirName $(HAIKU_TOP) data settings media dvb ]
# : dvb : -x Jamfile ;
# repository config and cache files
local repository ;
for repository in $(HAIKU_REPOSITORIES) {
build/jam/repositories/HaikuPorts/x86
+35 -25
View File
@@ -26,7 +26,7 @@ RemotePackageRepository HaikuPorts
beam-1.2-1
bepdf-1.2.0-1
bescreencapture-1.9.4-1
binutils-2.25_2014_12_27-1
binutils-2.25_12015_07_31-1
bison-2.4.3-6
buildbot_slave-0.8.8-2
burnitnow-0.1.0-1
@@ -36,14 +36,16 @@ RemotePackageRepository HaikuPorts
cdrtools_devel-3.01~a27-1
clang-3.4-3
clang_analysis-3.4-3
clipdinger-0.4-1
cmake-3.0.0_rc3-1
coreutils-8.23-1
coreutils-8.24-1
cpio-2.10-1
ctags-5.8-3
curl-7.42.1-1
curl_devel-7.42.1-1
curl-7.43.0-1
curl_devel-7.43.0-1
cvs-1.12.13.1-6
cvsps-2.2b1-1
diffutils-3.3-2
dos2unix-7.2.2-1
doxygen-1.6.3-4
dtc-1.4.1-1
@@ -90,7 +92,7 @@ RemotePackageRepository HaikuPorts
gzip-1.6-2
haikuwebkit-1.4.10-1
haikuwebkit_devel-1.4.10-1
help2man-1.44.1-1
help2man-1.46.6-1
htmldoc-1.8.27-3
icu-55.1-4
icu_devel-55.1-4
@@ -128,8 +130,8 @@ RemotePackageRepository HaikuPorts
libpcre_devel-8.21-5
libpng-1.5.22-1
libpng_devel-1.5.22-1
libpng16-1.6.17-1
libpng16_devel-1.6.17-1
libpng16-1.6.18-1
libpng16_devel-1.6.18-1
libsanta-3.0.1-1
libsanta_devel-3.0.1-1
libsdl-1.2.15-6
@@ -142,8 +144,8 @@ RemotePackageRepository HaikuPorts
libtheora_devel-1.1.1-2
libtool-2.4.2-1
libtool_libltdl-2.4.2-1
libunistring-0.9.5-1
libunistring_devel-0.9.5-1
libunistring-0.9.6-1
libunistring_devel-0.9.6-1
libvorbis-1.3.5-1
libvorbis_devel-1.3.5-1
libvpx-1.0.0-2
@@ -156,8 +158,8 @@ RemotePackageRepository HaikuPorts
libxslt-1.1.28-2
libxslt_devel-1.1.28-2
llvm-3.5.2-1
lz4-r117-1
lz4_devel-r117-1
lz4-r131-1
lz4_devel-r131-1
lzo-2.09-1
lzo_devel-2.09-1
m4-1.4.16-5
@@ -169,9 +171,13 @@ RemotePackageRepository HaikuPorts
mesa_swrast-10.1.1-1
mesa_swpipe-10.1.1-1
mkdepend-1.7-3
mpg123-1.22.0-1
mpg123_devel-1.22.0-1
nano-2.4.0-1
mpc-1.0.3-1
mpc_devel-1.0.3-1
mpfr-3.1.3-1
mpfr_devel-3.1.3-1
mpg123-1.22.3-1
mpg123_devel-1.22.3-1
nano-2.4.2-1
nasm-2.11.08-1
ncurses-5.9-10
ncurses_devel-5.9-10
@@ -180,7 +186,7 @@ RemotePackageRepository HaikuPorts
netcat-1.10-1
ninja-1.5.1-2
openjdk-1.7_2013_11_08-2
openssh-6.0p1-8
openssh-6.9p1-1
# sync openssl with secondary architecture (x86_gcc2)
openssl-1.0.0s-1
openssl_devel-1.0.0s-1
@@ -207,8 +213,8 @@ RemotePackageRepository HaikuPorts
sharutils-4.14-1
speex-1.2~rc1-2
speex_devel-1.2~rc1-2
sqlite-3.8.8.3-1
sqlite_devel-3.8.8.3-1
sqlite-3.8.11.1-1
sqlite_devel-3.8.11.1-1
subversion-1.6.18-6
subversion_devel-1.6.18-6
tar-1.27.1-2
@@ -228,8 +234,8 @@ RemotePackageRepository HaikuPorts
which-2.21-1
wpa_supplicant-2.0-3
xml_parser-2.36-1
xz_utils-5.0.8-1
xz_utils_devel-5.0.8-1
xz_utils-5.0.8-2
xz_utils_devel-5.0.8-2
yasm-1.2.0-3
zip-3.0-2
zlib-1.2.8-4
@@ -239,8 +245,8 @@ RemotePackageRepository HaikuPorts
binutils_x86_gcc2-2.17_2013_04_21-2
bzip2_x86_gcc2-1.0.6-5
bzip2_x86_gcc2_devel-1.0.6-5
curl_x86_gcc2-7.42.1-1
curl_x86_gcc2_devel-7.42.1-1
curl_x86_gcc2-7.43.0-1
curl_x86_gcc2_devel-7.43.0-1
expat_x86_gcc2-2.1.0-1
expat_x86_gcc2_devel-2.1.0-1
ffmpeg_x86_gcc2-0.10.2-4
@@ -278,8 +284,8 @@ RemotePackageRepository HaikuPorts
libogg_x86_gcc2_devel-1.3.0-2
libpng_x86_gcc2-1.5.22-1
libpng_x86_gcc2_devel-1.5.22-1
libpng16_x86_gcc2-1.6.17-1
libpng16_x86_gcc2_devel-1.6.17-1
libpng16_x86_gcc2-1.6.18-1
libpng16_x86_gcc2_devel-1.6.18-1
libsolv_x86_gcc2-0.3.0_haiku_2014_12_22-1
libsolv_x86_gcc2_devel-0.3.0_haiku_2014_12_22-1
libtheora_x86_gcc2-1.1.1-2
@@ -302,8 +308,8 @@ RemotePackageRepository HaikuPorts
pkgconfig_x86_gcc2-0.27.1-2
speex_x86_gcc2-1.2~rc1-2
speex_x86_gcc2_devel-1.2~rc1-2
sqlite_x86_gcc2-3.8.8.3-1
sqlite_x86_gcc2_devel-3.8.8.3-1
sqlite_x86_gcc2-3.8.11.1-1
sqlite_x86_gcc2_devel-3.8.11.1-1
tiff_x86_gcc2-3.9.6-2
tiff_x86_gcc2_devel-3.9.6-2
tinyxml_x86_gcc2-2.6.2-1
@@ -329,12 +335,14 @@ RemotePackageRepository HaikuPorts
cdrtools
clang
cmake
clipdinger
coreutils
cpio
ctags
curl
cvs
cvsps
diffutils
dos2unix
doxygen
dtc
@@ -405,6 +413,8 @@ RemotePackageRepository HaikuPorts
mesa
mesa_x86_gcc2
mkdepend
mpc
mpfr
mpg123
nano
nasm
build/jam/repositories/HaikuPorts/x86_64
+29 -19
View File
@@ -25,7 +25,7 @@ RemotePackageRepository HaikuPorts
automake-1.13.1-4
bash-4.3.39-1
# bepdf-1.1.1~beta5_2013_04_28-1
binutils-2.25_2014_12_27-1
binutils-2.25_12015_07_31-1
bison-2.6.5-1
boost-1.55.0-6
boost_atomic-1.55.0-6
@@ -58,14 +58,16 @@ RemotePackageRepository HaikuPorts
cdrtools_devel-3.01~a29-1
clang-3.5.1-1
clang_analysis-3.5.1-1
clipdinger-0.4-1
cmake-3.2.3-1
coreutils-8.23-1
coreutils-8.24-1
cppunit-1.12.1-2
cppunit_devel-1.12.1-2
ctags-5.8-3
curl-7.42.1-1
curl_devel-7.42.1-1
curl-7.43.0-1
curl_devel-7.43.0-1
cvs-1.12.13.1-6
diffutils-3.3-2
dos2unix-7.2.2-1
doxygen-1.6.3-4
dtc-1.4.1-1
@@ -131,7 +133,7 @@ RemotePackageRepository HaikuPorts
handbrake-0.10.1-1
harfbuzz-0.9.40-1
harfbuzz_devel-0.9.40-1
help2man-1.44.1-1
help2man-1.46.6-1
htmldoc-1.8.27-3
icu-55.1-3
icu_devel-55.1-3
@@ -189,8 +191,8 @@ RemotePackageRepository HaikuPorts
libpcre_devel-8.21-5
libpng-1.5.22-1
libpng_devel-1.5.22-1
libpng16-1.6.17-1
libpng16_devel-1.6.17-1
libpng16-1.6.18-1
libpng16_devel-1.6.18-1
librevenge-0.0.1-1
librevenge_devel-0.0.1-1
libsamplerate-0.1.8-2
@@ -209,8 +211,8 @@ RemotePackageRepository HaikuPorts
libtheora_devel-1.1.1-2
libtool-2.4.2-1
libtool_libltdl-2.4.2-1
libunistring-0.9.5-1
libunistring_devel-0.9.5-1
libunistring-0.9.6-1
libunistring_devel-0.9.6-1
libusb-1.0.19-2
libusb_devel-1.0.19-2
libusb_compat-0.1.5-2
@@ -229,8 +231,8 @@ RemotePackageRepository HaikuPorts
llvm-3.5.2-1
lua-5.2.3-2
lua_devel-5.2.3-2
lz4-r130-1
lz4_devel-r130-1
lz4-r131-1
lz4_devel-r131-1
lzo-2.09-1
lzo_devel-2.09-1
m4-1.4.16-5
@@ -242,9 +244,13 @@ RemotePackageRepository HaikuPorts
mesa_swrast-10.5.2-1
mesa_swpipe-10.5.2-1
mkdepend-1.7-3
mpg123-1.22.0-1
mpg123_devel-1.22.0-1
nano-2.4.0-1
mpc-1.0.3-1
mpc_devel-1.0.3-1
mpfr-3.1.3-1
mpfr_devel-3.1.3-1
mpg123-1.22.3-1
mpg123_devel-1.22.3-1
nano-2.4.2-1
nasm-2.11.08-1
ncurses-5.9-10
ncurses_devel-5.9-10
@@ -254,7 +260,7 @@ RemotePackageRepository HaikuPorts
ninja-1.5.1-2
nspr-4.10.8-1
nspr_devel-4.10.8-1
openssh-6.6p1-1
openssh-6.9p1-1
openssl-1.0.0s-1
openssl_devel-1.0.0s-1
p7zip-9.20.1-5
@@ -287,8 +293,8 @@ RemotePackageRepository HaikuPorts
smpeg_devel-0.4.5-4
speex-1.2~rc1-2
speex_devel-1.2~rc1-2
sqlite-3.8.10.0-1
sqlite_devel-3.8.10.0-1
sqlite-3.8.11.1-1
sqlite_devel-3.8.11.1-1
subversion-1.8.11-1
subversion_devel-1.8.11-1
tar-1.27.1-2
@@ -310,8 +316,8 @@ RemotePackageRepository HaikuPorts
xml_parser-2.36-1
x264-20140308-1
x264_devel-20140308-1
xz_utils-5.0.6-1
xz_utils_devel-5.0.6-1
xz_utils-5.0.8-2
xz_utils_devel-5.0.8-2
yasm-1.2.0-3
zip-3.0-2
zlib-1.2.8-4
@@ -331,12 +337,14 @@ RemotePackageRepository HaikuPorts
bzip2
cdrtools
clang
clipdinger
cmake
coreutils
cppunit
ctags
curl
cvs
diffutils
dos2unix
doxygen
dtc
@@ -430,6 +438,8 @@ RemotePackageRepository HaikuPorts
mercurial
mesa
mkdepend
mpc
mpfr
mpg123
nano
nasm
build/jam/repositories/HaikuPorts/x86_gcc2
+77 -41
View File
@@ -26,6 +26,7 @@ RemotePackageRepository HaikuPorts
:
# repository architecture packages
# primary architecture (x86_gcc2)
2cdt-2014.01.03-1
a_book-1.1-3
a52dec-0.7.4-2
a52dec_devel-0.7.4-2
@@ -71,17 +72,20 @@ RemotePackageRepository HaikuPorts
cdrtools-3.01~a30-1
cdrtools_devel-3.01~a30-1
chat-20100903-2
clipdinger-0.3-1
clipdinger-0.4-1
clockwerk-git-3
cpctools-0.3.0-2
criticalmass-2.2-1
ctags-5.8-3
colors-2.3-1
coreutils-8.23-1
curl-7.42.1-1
curl_devel-7.42.1-1
coreutils-8.24-1
curl-7.43.0-1
curl_devel-7.43.0-1
cvs-1.12.13.1-6
d52-3.4.1-1
desknotes-1.1-4
dfu_util-0.7-1
diffutils-3.3-2
distcc-3.1-3
djvulibre-3.5.25-2
djvulibre_devel-3.5.25-2
@@ -94,6 +98,7 @@ RemotePackageRepository HaikuPorts
ed-1.7-1
enca-1.15-1
enca_devel-1.15-1
exomizer-2.0.7-1
expat-2.1.0-1
expat_devel-2.1.0-1
faac-1.28-2
@@ -107,6 +112,8 @@ RemotePackageRepository HaikuPorts
findutils-4.4.2-1
ffmpeg-0.10.14-3
ffmpeg_devel-0.10.14-3
fftw-3.3.4-6
fftw_devel-3.3.4-6
flac-1.3.0-1
flac_devel-1.3.0-1
flex-2.5.39-1
@@ -164,7 +171,7 @@ RemotePackageRepository HaikuPorts
gutenprint_devel-5.2.10-1
gyp-r1948-2
gzip-1.6-2
help2man-1.44.1-1
help2man-1.46.6-1
htmldoc-1.8.27-3
html_parser-3.71-1
hubbub-0.3.0-1
@@ -206,6 +213,9 @@ RemotePackageRepository HaikuPorts
libcuefile_devel-r475-1
libdca-0.0.5-1
libdca_devel-0.0.5-1
libdsk-1.3.8-1
libdsk_devel-1.3.8-1
libdsk_tools-1.3.8-1
libdvbpsi-1.2.0-1
libdvbpsi_devel-1.2.0-1
libdvdcss-1.3.0-1
@@ -256,8 +266,8 @@ RemotePackageRepository HaikuPorts
libpcre_devel-8.21-5
libpng-1.5.22-1
libpng_devel-1.5.22-1
libpng16-1.6.17-1
libpng16_devel-1.6.17-1
libpng16-1.6.18-1
libpng16_devel-1.6.18-1
libpthread_stubs-0.3-2
libreplaygain-r475-1
libreplaygain_devel-r475-1
@@ -285,8 +295,8 @@ RemotePackageRepository HaikuPorts
libusb_compat_devel-0.1.5-2
libuuid-1.0.3-2
libuuid_devel-1.0.3-2
libunistring-0.9.5-1
libunistring_devel-0.9.5-1
libunistring-0.9.6-1
libunistring_devel-0.9.6-1
libvorbis-1.3.5-1
libvorbis_devel-1.3.5-1
libvpx-1.0.0-2
@@ -300,6 +310,8 @@ RemotePackageRepository HaikuPorts
libxml2_python-2.8.0-9
libxslt-1.1.28-4
libxslt_devel-1.1.28-4
libzip-0.11.2-1
libzip_devel-0.11.2-1
lighttpd-1.4.35-2
lighttpd_devel-1.4.35-2
links-2.8-1
@@ -309,8 +321,8 @@ RemotePackageRepository HaikuPorts
lua-5.2.1-6
lua_devel-5.2.1-6
lynx-2.8.9dev.1-1
lz4-r117-1
lz4_devel-r117-1
lz4-r131-1
lz4_devel-r131-1
lzo-2.09-1
lzo_devel-2.09-1
m4-1.4.16-5
@@ -331,15 +343,15 @@ RemotePackageRepository HaikuPorts
moe-1.1.2-1
mog-0.63.1548-1
most-pre5.1_15-1
mpg123-1.22.0-1
mpg123_devel-1.22.0-1
mpg123-1.22.3-1
mpg123_devel-1.22.3-1
mtr-0.73-1
multitalk-1.4-1
mupdf-1.7-1
mupdf_devel-1.7-1
musepack_tools-r475-1
musepack_tools_devel-r475-1
nano-2.4.0-1
nano-2.4.2-1
nanosvgtranslator-1.0.1-1
nasm-2.11.08-1
ncurses-5.9-9
@@ -353,7 +365,7 @@ RemotePackageRepository HaikuPorts
openjpeg-2.1.0-2
openjpeg_devel-2.1.0-2
opensound-4.2_git-2
openssh-6.8p1-2
openssh-6.9p1-1
# sync openssl with secondary architecture (x86)
openssl-1.0.0s-1
openssl_devel-1.0.0s-1
@@ -439,8 +451,8 @@ RemotePackageRepository HaikuPorts
smpeg_devel-0.4.5-3
speex-1.2~rc1-2
speex_devel-1.2~rc1-2
sqlite-3.8.8.3-1
sqlite_devel-3.8.8.3-1
sqlite-3.8.11.1-1
sqlite_devel-3.8.11.1-1
srm-1.2.12-1
substrate-1.0b-1
subversion-1.8.11-1
@@ -465,14 +477,16 @@ RemotePackageRepository HaikuPorts
unrar-5.2.6-1
unzip-6.0-2
util_macros-1.19.0-2
vasm-1.7c-1
vcdimager-0.7.24-2
vcdimager_devel-0.7.24-2
vlc-0.8.6i-1
vlc_devel-0.8.6i-1
vim-7.4-3
virtualbox_guest_additions-4.3.53_svn-1
vmware_addons-1.1.1-2
vision-0.9.7.r949-2
vlc-0.8.6i-1
vlc_devel-0.8.6i-1
vlink-0.15-1
vmware_addons-1.1.1-2
weather-0.1.1_git-1
wget-1.16.3-1
which-2.21-1
@@ -504,7 +518,7 @@ RemotePackageRepository HaikuPorts
avr_gcc_x86-4.8.2_2014_03_20-1
avrdude_x86-6.0.1-2
beshare_x86-2.31-1
binutils_x86-2.25_2014_12_27-1
binutils_x86-2.25_12015_07_31-1
bison_x86-2.5-1
boost_x86-1.55.0-6
boost_x86_atomic-1.55.0-6
@@ -533,12 +547,14 @@ RemotePackageRepository HaikuPorts
burnitnow_x86-0.1.0-1
bzip2_x86-1.0.6-5
bzip2_x86_devel-1.0.6-5
capstone_x86-3.0.4-1
capstone_x86_devel-3.0.4-1
cmake_x86-3.2.3-1
confuse_x86-2.7-2
confuse_x86_devel-2.7-2
copynametoclipboard-1.0.1-2
curl_x86-7.42.1-1
curl_x86_devel-7.42.1-1
curl_x86-7.43.0-1
curl_x86_devel-7.43.0-1
cvsps_x86-2.2b1-1
dbus_x86-1.8.6-1
dbus_x86_devel-1.8.6-1
@@ -556,11 +572,13 @@ RemotePackageRepository HaikuPorts
expat_x86_devel-2.1.0-1
faad2_x86-2.7-1
faad2_x86_devel-2.7-1
file_x86-5.15-1
file_x86_devel-5.15-1
fish_x86-1.23.1_git-1
ffmpeg_x86-0.11.5-2
ffmpeg_x86_devel-0.11.5-2
fftw_x86-3.3.4-4
fftw_x86_devel-3.3.4-4
fftw_x86-3.3.4-6
fftw_x86_devel-3.3.4-6
flac_x86-1.3.0-1
flac_x86_devel-1.3.0-1
flare_x86-0.19-3
@@ -664,8 +682,8 @@ RemotePackageRepository HaikuPorts
libid3tag_x86_devel-0.15.1b-1
libmad_x86-0.15.1b-2
libmad_x86_devel-0.15.1b-2
libmikmod_x86-3.3.3-2
libmikmod_x86_devel-3.3.3-2
libmikmod_x86-3.3.7-1
libmikmod_x86_devel-3.3.7-1
libmng_x86-2.0.2-1
libmng_x86_devel-2.0.2-1
libmodplug_x86-0.8.8.4-2
@@ -680,8 +698,8 @@ RemotePackageRepository HaikuPorts
libpcre_x86_devel-8.33-2
libpng_x86-1.5.22-1
libpng_x86_devel-1.5.22-1
libpng16_x86-1.6.17-1
libpng16_x86_devel-1.6.17-1
libpng16_x86-1.6.18-1
libpng16_x86_devel-1.6.18-1
libqt4_x86-4.8.6.4-4
libqt4_x86_devel-4.8.6.4-4
librecad_x86-2.0.7-1
@@ -717,6 +735,8 @@ RemotePackageRepository HaikuPorts
libxml2_x86_devel-2.9.2-1
libxslt_x86-1.1.28-2
libxslt_x86_devel-1.1.28-2
libzip_x86-0.11.2-1
libzip_x86_devel-0.11.2-1
llvm_x86-3.5.2-1
lmms_x86-1.2.0_git-1
lua_x86-5.2.3-2
@@ -734,13 +754,13 @@ RemotePackageRepository HaikuPorts
mesa_x86_swrast-10.1.0-2
mesa_x86_swpipe-10.1.0-2
mosh_x86-1.2.4-1
mpc_x86-1.0.2-2
mpc_x86_devel-1.0.2-2
mpc_x86-1.0.3-1
mpc_x86_devel-1.0.3-1
mpd_x86-0.18.12_git-1
mpfr_x86-3.1.2-2
mpfr_x86_devel-3.1.2-2
mpg123_x86-1.22.0-1
mpg123_x86_devel-1.22.0-1
mpfr_x86-3.1.3-1
mpfr_x86_devel-3.1.3-1
mpg123_x86-1.22.3-1
mpg123_x86_devel-1.22.3-1
mplayer_x86-1.1.1-3
mupdf_x86-1.7-1
mupdf_x86_devel-1.7-1
@@ -781,6 +801,8 @@ RemotePackageRepository HaikuPorts
quassel_x86-0.10.0-2
quicklaunch-0.9.10-1
qupzilla_x86-1.8.6-1
radare2_x86-0.9.9-1
radare2_x86_devel-0.9.9-1
rcs_x86-5.9.3-2
readline_x86-6.3-2
readline_x86_devel-6.3-2
@@ -810,8 +832,8 @@ RemotePackageRepository HaikuPorts
smpeg_x86_devel-0.4.5-3
speex_x86-1.2~rc1-2
speex_x86_devel-1.2~rc1-2
sqlite_x86-3.8.8.3-1
sqlite_x86_devel-3.8.8.3-1
sqlite_x86-3.8.11.1-1
sqlite_x86_devel-3.8.11.1-1
stlink_x86-1.0.0-1
stm32flash_x86-0.3-1
strigi_x86-0.7.5-2
@@ -832,12 +854,13 @@ RemotePackageRepository HaikuPorts
vacuum_x86-1.2.5-1
vcmi_x86-0.94-1
wizznic_x86-0.9.9-2
xz_utils_x86-5.0.5-3
xz_utils_x86_devel-5.0.5-3
xz_utils_x86-5.0.8-2
xz_utils_x86_devel-5.0.8-2
zlib_x86-1.2.8-4
zlib_x86_devel-1.2.8-4
:
# source packages
2cdt
a_book
a52dec
a52dec_x86
@@ -887,6 +910,7 @@ RemotePackageRepository HaikuPorts
bzr
canna
capitalbe
capstone_x86
catkeyseditor
caya
ccache
@@ -899,11 +923,13 @@ RemotePackageRepository HaikuPorts
confuse_x86
copynametoclipboard
coreutils
cpctools
criticalmass
ctags
curl
cvs
cvsps_x86
d52
dbus_x86
ddrescue_x86
desknotes
@@ -913,6 +939,7 @@ RemotePackageRepository HaikuPorts
djvulibre_x86
djvutranslator
djvuviewer
diffutils
distcc
dmidecode
documentviewer_x86
@@ -924,16 +951,19 @@ RemotePackageRepository HaikuPorts
ed
enca
enca_x86
exomizer
expat
faac
faad2
faad2_x86
f1spirit
file
file_x86
filwip
findutils
fish_x86
ffmpeg
fftw
fftw_x86
flac
flare_x86
@@ -1017,6 +1047,7 @@ RemotePackageRepository HaikuPorts
libdbusmenu_qt_x86
libdca
libdca_x86
libdsk
libdv_x86
libdvbpsi
libdvdcss
@@ -1091,6 +1122,8 @@ RemotePackageRepository HaikuPorts
libxml2_x86
libxslt
libxslt_x86
libzip
libzip_x86
lighttpd
links
llvm_x86
@@ -1122,13 +1155,13 @@ RemotePackageRepository HaikuPorts
mksh
moe
mog
mpc_x86
mplayer_x86
mosh_x86
most
mpc_x86
mpd_x86
mpfr_x86
mpg123
mplayer_x86
mtr
multitalk
mupdf
@@ -1193,6 +1226,7 @@ RemotePackageRepository HaikuPorts
quassel_x86
quicklaunch
qupzilla_x86
radare2_x86
rcs_x86
readline
readline_x86
@@ -1254,11 +1288,13 @@ RemotePackageRepository HaikuPorts
util_macros
weather
vacuum_x86
vasm
vcdimager
vcmi_x86
vim
vision
vlc
vlink
vmware_addons
wget
which
data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/es.catkeys
+4 -1
View File
@@ -1,13 +1,16 @@
1 spanish; castilian x-vnd.Haiku-MatchHeader 3677427558
1 spanish; castilian x-vnd.Haiku-MatchHeader 3405428083
<Choose action> ConfigView <Elegir acción>
has ConfigView tiene
Move to ConfigView Mover a
Then ConfigView Luego
this field is based on the action ConfigView este campo está basado en la acción
Delete message ConfigView Borrar mensaje
value (use REGEX: in front of regular expressions like *spam*) ConfigView valor (use REGEX: frente a expresiones regulares como *spam*)
<Choose account> ConfigView <Elegir cuenta>
Set flags to ConfigView Seleccionar banderas a
Set as read ConfigView Marcar como leído
Match header RuleFilter Cabecera concordante
Reply with ConfigView Responder con
If ConfigView Si
Match \"%attribute\" against \"%regex\" RuleFilter Concordar \"%attribute\" contra \"%regex\"
header (e.g. Subject) ConfigView Cabecera (p. ej. Tema)
data/catalogs/add-ons/mail_daemon/inbound_filters/notifier/es.catkeys
+14 -14
View File
@@ -1,14 +1,14 @@
1 spanish; castilian x-vnd.Haiku-NewMailNotification 4243490201
{0, plural, one{# new message} other{# new messages}} filter {0, plural, one{# mensaje nuevo} other{# mensajes nuevos}}
Keyboard LEDs ConfigView LEDs de teclado
Log window ConfigView Ventana de log
Central beep ConfigView Beep central
Beep ConfigView Beep
Method: ConfigView Método:
Central alert ConfigView Alerta central
Alert ConfigView Alerta
none ConfigView ninguno
You have {0, plural, one{# new message} other{# new messages}} for %account. filter Tiene {0, plural, one{# mensaje nuevo} other{# mensajes nuevos}} para %account.
New messages filter Nuevos mensajes
New mails notification ConfigView Nuevas notificaciones de correo
OK filter Aceptar
1 spanish; castilian x-vnd.Haiku-NewMailNotification 73789504
You have {0, plural, one{One new message} other{# new messages}} for %account. NotifierFilter Usted tiene {0, plural, one{Un nuevo mensaje} other{# mensajes nuevos}} en %account.
none NotifierConfigView ninguno
Method: NotifierConfigView Método:
Beep NotifierConfigView Beep
{0, plural, one{One new message} other{# new messages}} NotifierFilter {0, plural, one{Un mensaje nuevo} other{# mensajes nuevos}}
New mails notification NotifierFilter Nuevas notificaciones de correo
Central alert NotifierConfigView Alerta central
OK NotifierFilter Aceptar
New messages NotifierFilter Nuevos mensajes
Log window NotifierConfigView Ventana de log
Keyboard LEDs NotifierConfigView LEDs de teclado
Central beep NotifierConfigView Beep central
Alert NotifierConfigView Alerta
data/catalogs/add-ons/mail_daemon/inbound_filters/spam_filter/es.catkeys
+2 -1
View File
@@ -1,6 +1,7 @@
1 spanish; castilian x-vnd.Haiku-SpamFilter 160316705
1 spanish; castilian x-vnd.Haiku-SpamFilter 468104950
or empty e-mail SpamFilterConfig o un e-mail vacío.
Genuine below and uncertain above: SpamFilterConfig Original lo de debajo e incierto lo anterior:
Spam above: SpamFilterConfig Spam anterior:
Add spam rating to start of subject SpamFilterConfig Añade una calificación de spam al comienzo del tema del correo
Bayesian Spam Filter SpamFilter Filtro de Spam bayesiano
Learn from all incoming e-mail SpamFilterConfig Aprende de todos los e-mails entrantes
data/catalogs/add-ons/mail_daemon/inbound_protocols/imap/es.catkeys
+6 -1
View File
@@ -1,7 +1,12 @@
1 spanish; castilian x-vnd.Haiku-IMAP 3950045582
1 spanish; castilian x-vnd.Haiku-IMAP 354143849
Destination: imap_config Destino:
Ok IMAPFolderConfig Aceptar
status IMAPFolderConfig Estado:
Configure IMAP Folders imap_config Configurar carpetas IMAP
Cancel IMAPFolderConfig Cancelar
Apply IMAPFolderConfig Aplicar
Fetching IMAP folders, have patience... IMAPFolderConfig Recopilando carpetas IMAP, paciencia por favor...
Could not connect to server \"%server%\":\n%error% IMAPFolderConfig No se pudo conectar al servidor \"%server%\":\n%error%
IMAP Folders IMAPFolderConfig Carpetas IMAP
Update subcription of IMAP folders, have patience... IMAPFolderConfig Actualizando la suscripción de las carpetas IMAP, tenga paciencia...
Failed to fetch available storage. IMAPFolderConfig No se pudo recopilar el espacio disponible.
data/catalogs/add-ons/mail_daemon/outbound_filters/fortune/es.catkeys
+2 -1
View File
@@ -1,4 +1,5 @@
1 spanish; castilian x-vnd.Haiku-Fortune 1292458430
1 spanish; castilian x-vnd.Haiku-Fortune 52757361
Fortune FortuneFilter Fortuna
Fortune file: ConfigView Archivo de fortunas:
Fortune cookie says:\n\n ConfigView La galleta de la fortuna dice:\n\n
Tag line: ConfigView Lema:
data/catalogs/add-ons/network_settings/dnsclient/es.catkeys
+7
View File
@@ -0,0 +1,7 @@
1 spanish; castilian x-vnd.Haiku-DNSClientService 160307182
DNS settings DNSClientServiceAddOn Configuración de DNS
Move down DNSSettingsView Mover abajo
DNS settings DNSSettingsView Configuración de DNS
Remove DNSSettingsView Quitar
Domain: DNSSettingsView Dominio:
Add DNSSettingsView Agregar
data/catalogs/add-ons/network_settings/ftpd/fr.catkeys
+1 -1
View File
@@ -1,3 +1,3 @@
1 french x-vnd.Haiku-FTPService 4086152171
FTP server FTPServiceAddOn Serveur FTP
The FTP server allows you to remotely access the files on your machine using the FTP protocol.\n\nPlease note that it is an insecure and unencrypted connection. FTPServiceAddOn Le serveur FTP vous permet d'accéder à distance aux fichiers de votre machine à travers le protocole FTP.\n\nVeuillez noter que la connexion n'est ni sécurisée et ni chiffrée.
The FTP server allows you to remotely access the files on your machine using the FTP protocol.\n\nPlease note that it is an insecure and unencrypted connection. FTPServiceAddOn Le serveur FTP vous permet d'accéder à distance aux fichiers de votre machine à travers le protocole FTP.\n\nVeuillez noter que la connexion n'est ni sécurisée ni chiffrée.
data/catalogs/add-ons/network_settings/ipv4/es.catkeys
+2
View File
@@ -0,0 +1,2 @@
1 spanish; castilian x-vnd.Haiku-IPv4Interface 2854844856
IPv4 IPv4InterfaceAddOn IPv4
data/catalogs/add-ons/network_settings/ipv6/es.catkeys
+2
View File
@@ -0,0 +1,2 @@
1 spanish; castilian x-vnd.Haiku-IPv6Interface 1391114020
IPv6 IPv6InterfaceAddOn IPv6
data/catalogs/add-ons/network_settings/sshd/es.catkeys
+2
View File
@@ -0,0 +1,2 @@
1 spanish; castilian x-vnd.Haiku-SSHService 992151130
The SSH server allows you to remotely access your machine with a terminal session, as well as file access using the SCP and SFTP protocols. SSHServiceAddOn El servidor SSH le permite ingresar remotamente a su máquina con una sesión de terminal, así como a archivos utilizando los protocolos SCP y SFTP.
data/catalogs/add-ons/network_settings/telnetd/fr.catkeys
+1 -1
View File
@@ -1,3 +1,3 @@
1 french x-vnd.Haiku-TelnetService 1209067113
Telnet server TelnetServiceAddOn Serveur Telnet
The Telnet server allows you to remotely access your machine with a terminal session using the telnet protocol.\n\nPlease note that it is an insecure and unencrypted connection. TelnetServiceAddOn Le serveur Telnet vous permet d'accéder à distance à votre machine avec une session de terminal à travers le protocole Telnet.\n\nVeuillez noter que la connexion n'est ni sécurisée et ni chiffrée.
The Telnet server allows you to remotely access your machine with a terminal session using the telnet protocol.\n\nPlease note that it is an insecure and unencrypted connection. TelnetServiceAddOn Le serveur Telnet vous permet d'accéder à distance à votre machine avec une session de terminal à travers le protocole Telnet.\n\nVeuillez noter que la connexion n'est ni sécurisée ni chiffrée.
data/catalogs/add-ons/translators/ppm/es.catkeys
+3 -1
View File
@@ -1,4 +1,5 @@
1 spanish; castilian x-vnd.Haiku-PPMTranslator 797856484
1 spanish; castilian x-vnd.Haiku-PPMTranslator 2233502290
Version %d.%d.%d, %s PPMTranslator Versión %d.%d.%d, %s
PPM Settings PPMMain Configuración PPM
Based on PPMTranslator sample code PPMTranslator Basado en el código de ejemplo de PPMTranslator
OK PPMMain Aceptar
@@ -8,6 +9,7 @@ PPM image PPMTranslator Imagen PPM
RGBA 5:5:5:1 16 bits PPMTranslator RGBA 5:5:5:1 16 bits
Be Bitmap Format (PPMTranslator) PPMTranslator Formato Be Bitmap (PPMTranslator)
CMYA 8:8:8:8 32 bits PPMTranslator CMYA 8:8:8:8 32 bits
Input color space: PPMTranslator Espacio de Color de Entrada:
CMYK 8:8:8:8 32 bits PPMTranslator CMYK 8:8:8:8 32 bits
PPM image translator PPMTranslator Transformador de imágenes PPM
bits/space PPMTranslator bits/espacio
data/catalogs/add-ons/translators/psd/es.catkeys
+3 -1
View File
@@ -1,4 +1,4 @@
1 spanish; castilian x-vnd.Haiku-PSDTranslator 1706619436
1 spanish; castilian x-vnd.Haiku-PSDTranslator 3654055550
Lab PSDLoader Laboratorio
Uncompressed PSDConfig Sin comprimir
Indexed PSDLoader Indizado
@@ -6,8 +6,10 @@ Grayscale PSDLoader Escala de grises
Photoshop image translator PSDConfig Transformador de imágenes tipo Photoshop
Photoshop image translator PSDTranslator Transformador de imágenes tipo Photoshop
Version %d.%d.%d, %s PSDConfig Versión %d.%d.%d, %s
Photoshop Document (PSD file) PSDConfig Documento de Photoshop (Archivo PSD)
Photoshop image PSDTranslator Imagen de Photoshop
RLE PSDConfig RLE
Photoshop Big Document (PSB file) PSDConfig Documento grande de Photoshop (Archivo PSB)
RGBA PSDLoader RGBA
Photoshop image (%s) PSDTranslator Imagen de Photoshop (%s)
PSDTranslator Settings PSDConfig Ajustes de PSDTranslator
data/catalogs/add-ons/translators/sgi/es.catkeys
+3 -1
View File
@@ -1,9 +1,11 @@
1 spanish; castilian x-vnd.Haiku-SGITranslator 4153400005
1 spanish; castilian x-vnd.Haiku-SGITranslator 129108011
Use compression: SGIView Usar compresión:
SGITranslator Settings SGITranslator Configuración SGITranslator
None SGIView Ninguno
SGI images SGITranslator Imágenes SGI
SGI image translator SGITranslator Traductor de imagen SGI
\nbased on GIMP SGI plugin v1.5:\n SGIView \n\basado en el plugin SGI v1.5 de GIMP:\n
Version %d.%d.%d, %s SGIView Versión %d.%d.%d, %s
SGI image SGITranslator imagen SGI
RLE SGIView RLE
SGI Settings SGIMain Configuración SGI
data/catalogs/add-ons/translators/tga/es.catkeys
+3 -1
View File
@@ -1,4 +1,5 @@
1 spanish; castilian x-vnd.Haiku-TGATranslator 77519970
1 spanish; castilian x-vnd.Haiku-TGATranslator 3075011211
Save with RLE compression TGAView Guardar con compresión RLE
Targa image (%d bits truecolor) TGATranslator Imagen Targa (%d bits de color verdadero)
Ignore TGA alpha channel TGAView Ignorar el canal alfa TGA
Targa image (%d bits colormap) TGATranslator Imagen Targa (%d bits de mapa de color)
@@ -8,6 +9,7 @@ Targa image (%d bits gray) TGATranslator Imagen Targa (%d bits de gris)
Written by the Haiku Translation Kit Team TGAView Escrito por el equipo de traducción de Haiku
Targa image (%d bits RLE truecolor) TGATranslator Imagen Targa (%d bits RLE de color verdadero)
TGA images TGATranslator Imágenes TGA
Version %d.%d.%d, %s TGAView Versión %d.%d.%d, %s
TGATranslator Settings TGATranslator Configuración TGATranslator
TGA image translator TGATranslator Conversor de imagen TGA
Targa image (%d bits RLE gray) TGATranslator Imagen Targa (%d bits RLE de gris)
data/catalogs/add-ons/translators/tiff/es.catkeys
+2 -1
View File
@@ -1,5 +1,6 @@
1 spanish; castilian x-vnd.Haiku-TIFFTranslator 40018330
1 spanish; castilian x-vnd.Haiku-TIFFTranslator 2234713102
LZW TIFFView LZW
Version %d.%d.%d, %s TIFFView Versión %d.%d.%d, %s
identify_tiff_header: couldn't set directory\n TIFFTranslator identify_tiff_header: no pudo setear directorio\n
TIFF image TIFFTranslator imagen TIFF
TIFF Library: TIFFView Librería TIFF:
data/catalogs/apps/aboutsystem/es.catkeys
+2 -1
View File
@@ -1,4 +1,4 @@
1 spanish; castilian x-vnd.Haiku-About 2729565851
1 spanish; castilian x-vnd.Haiku-About 1096939572
Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved. AboutView Copyright © 1999-2010 por los autores de Gutenprint. Todos los derechos reservados.
Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (y su núcleo NewOS)\n
Ralink (firmware) AboutWindow Ralink (firmware)
@@ -63,6 +63,7 @@ Copyright © 1994-2008 Xiph.Org. All rights reserved. AboutView Copyright © 19
Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper. AboutView Copyright © 1998-2000 Thai Open Source Software Center Ltd y Clark Cooper.
Copyright © 2004-2005 Intel Corporation. All rights reserved. AboutView Copyright © 2004-2005 Intel Corporation. Todos los derechos reservados.
Copyright © 2002-2006 Maxim Shemanarev (McSeem). AboutView Copyright © 2002-2006 Maxim Shemanarev (McSeem).
Copyright © 2000-2014 Fabrice Bellard, et al. AboutView Derechos reservados © 2000-2014 Fabrice Bellard, et. al.
Copyright © 1999-2007 Michael C. Ring. All rights reserved. AboutView Copyright © 1999-2007 Michael C. Ring. Todos los derechos reservados.
The BeGeistert team\n AboutView El equipo de BeGeistert\n
The University of Auckland and Christof Lutteroth\n\n AboutView La Universidad de Auckland y a Christof Lutteroth\n\n
data/catalogs/apps/haikudepot/es.catkeys
+8 -1
View File
@@ -1,4 +1,4 @@
1 spanish; castilian x-vnd.Haiku-HaikuDepot 133580983
1 spanish; castilian x-vnd.Haiku-HaikuDepot 3640331610
Name PackageListView Nombre
Available packages MainWindow Paquetes disponibles
Open %DeskbarLink% PackageManager Abrir %DeskbarLink%
@@ -82,6 +82,7 @@ Create account UserLoginWindow Crear cuenta
Productivity Model Productividad
No, quit HaikuDepot App No, salir de HaikuDepot
Authentication failed UserLoginWindow Falló la autenticación
Logged in as %User% MainWindow Sesión iniciada como %User%
Language RatePackageWindow Idioma
Failed to create or update rating: %s\n RatePackageWindow Fallo al crear o actualizar la valoración: %s\n
You need to be logged into an account before you can rate packages. MainWindow Necesita haber ingresado con una cuenta antes de poder valorar paquetes.
@@ -94,8 +95,14 @@ Games Model Juegos
Rating PackageListView Valoraciones
(%Votes%) FeaturedPackagesView (%Votes%)
There was a puzzling response from the web service. UserLoginWindow Hubo una respuesta misteriosa desde el servicio Web.
Graphics Model Gráficos
Local MainWindow Local
Close MainWindow Cerrar
Preferred language: UserLoginWindow Idioma preferido:
Failed to rate package RatePackageWindow Fallo al valorar el paquete
Internet & Network Model Internet y red
Cancel MainWindow Cancelar
Quit HaikuDepot App Salir de HaikuDepot
Input validation UserLoginWindow Validación de entrada
Update RatePackageWindow Actualizar
Video Model Vídeo
data/catalogs/apps/mail/de.catkeys
+2 -1
View File
@@ -1,4 +1,4 @@
1 german x-vnd.Be-MAIL 233997769
1 german x-vnd.Be-MAIL 1310033600
View Mail Ansicht
%d - Date Mail %d - Datum
Attach attributes: Mail Attribute von Anhängen:
@@ -146,6 +146,7 @@ Open attachment Mail Anhang öffnen
sent B_USER_DIRECTORY/mail/sent Gesendet
(Date unavailable) Mail (Datum nicht verfügbar)
Put your favorite e-mail queries and query templates in this folder. Mail In diesem Ordner können E-Mail-Queries und Query-Vorlagen abgelegt werden.
Spam Mail Spam
Reply Mail Antworten
From: Mail Von:
Couldn't open this signature. Sorry. Mail Diese Signatur konnte leider nicht geöffnet werden.
data/catalogs/apps/mail/es.catkeys
+2 -1
View File
@@ -1,4 +1,4 @@
1 spanish; castilian x-vnd.Be-MAIL 233997769
1 spanish; castilian x-vnd.Be-MAIL 1310033600
View Mail Ver
%d - Date Mail %d - Fecha
Attach attributes: Mail Adjuntar atributos:
@@ -146,6 +146,7 @@ Open attachment Mail Abrir adjunto
sent B_USER_DIRECTORY/mail/sent enviado
(Date unavailable) Mail (Fecha indisponible)
Put your favorite e-mail queries and query templates in this folder. Mail Ponga sus consultas y plantillas de consulta de correo favoritas en esta carpeta.
Spam Mail Correo basura
Reply Mail Responder
From: Mail De:
Couldn't open this signature. Sorry. Mail No se pudo abrir la firma. Disculpe.
data/catalogs/apps/mail/fr.catkeys
+2 -1
View File
@@ -1,4 +1,4 @@
1 french x-vnd.Be-MAIL 233997769
1 french x-vnd.Be-MAIL 1310033600
View Mail Vue
%d - Date Mail %d - Date
Attach attributes: Mail Attributs du fichier joint :
@@ -146,6 +146,7 @@ Open attachment Mail Ouvrir le fichier joint
sent B_USER_DIRECTORY/mail/sent envoyés
(Date unavailable) Mail (Date non disponible)
Put your favorite e-mail queries and query templates in this folder. Mail Mettez vos requêtes d’e-mail et vos modèles de requêtes dans ce dossier.
Spam Mail Courrier indésirable
Reply Mail Répondre
From: Mail De :
Couldn't open this signature. Sorry. Mail Impossible d’ouvrir cette signature. Désolé.
data/catalogs/apps/mail/ja.catkeys
+2 -1
View File
@@ -1,4 +1,4 @@
1 japanese x-vnd.Be-MAIL 233997769
1 japanese x-vnd.Be-MAIL 1310033600
View Mail 表示
%d - Date Mail %d - 日付
Attach attributes: Mail 属性の添付:
@@ -146,6 +146,7 @@ Open attachment Mail 添付ファイルを開く
sent B_USER_DIRECTORY/mail/sent 送信済みメール
(Date unavailable) Mail (日付は利用できません)
Put your favorite e-mail queries and query templates in this folder. Mail お気に入りの電子メールクエリーとクエリテンプレートをこのフォルダーに入れてください。
Spam Mail スパム
Reply Mail 返信
From: Mail 差出人:
Couldn't open this signature. Sorry. Mail この署名を開くことはできませんでした。
data/catalogs/apps/mediaplayer/es.catkeys
+3 -1
View File
@@ -1,4 +1,4 @@
1 spanish; castilian x-vnd.Haiku-MediaPlayer 1149772289
1 spanish; castilian x-vnd.Haiku-MediaPlayer 1854844358
raw audio MediaPlayer-InfoWin audio bruto
Location MediaPlayer-InfoWin Ubicación
1.85 : 1 (American) MediaPlayer-Main 1.85 : 1 (Americano)
@@ -91,6 +91,7 @@ Automatically start playing MediaPlayer-SettingsWindow Empezar a reproducir aut
Track Video Track Menu Pista
Internal error (locking failed). Saving the playlist failed. MediaPlayer-PlaylistWindow Error interno (bloquear falló). Guardar la lista de reproducción falló.
View options MediaPlayer-SettingsWindow Ver opciones
none MediaPlayer-Main ninguno
Play mode MediaPlayer-SettingsWindow Modo de reproducción
Remove Entries MediaPlayer-RemovePLItemsCmd Eliminar entradas
Video track MediaPlayer-Main Pista de vídeo
@@ -119,6 +120,7 @@ raw video MediaPlayer-InfoWin video bruto
Volume of background clips MediaPlayer-SettingsWindow Volumen de secuencias de fondo
Internal error (out of memory). Saving the playlist failed. MediaPlayer-PlaylistWindow Error interno (sin memoria ). Guardar lista de reproducción falló.
Hide interface MediaPlayer-Main Esconder interfaz
Open clips MediaPlayer-Main Abrir las secuencias
Copy Entry MediaPlayer-CopyPLItemsCmd Copiar entrada
none Subtitles menu ninguno
Move file to Trash MediaPlayer-PlaylistWindow Mover archivo a la papelera
data/catalogs/apps/packageinstaller/es.catkeys
+2 -1
View File
@@ -1,4 +1,4 @@
1 spanish; castilian x-vnd.Haiku-PackageInstaller 1413270297
1 spanish; castilian x-vnd.Haiku-PackageInstaller 591566249
Install to: PackageView Instalar a:
OK PackageView OK
Accept PackageTextViewer Aceptar
@@ -50,6 +50,7 @@ Abort PackageInstall Cancelar
%name% (%size%) PackageView %name% (%size%)
Continue PackageTextViewer Continuar
Begin PackageView Empezar
The symbolic link named '%s' already exists in the given path.\nReplace the link with the one from this package or skip it? PackageView El enlace simbólico llamado '%s' ya existe en la ruta dada.\n¿Remplazar el enlace con el contenido en este paquete o saltarlo?
Replace PackageView Reemplazar
Installation progress PackageView Progreso de instalación
The package file is not readable.\nOne of the possible reasons for this might be that the requested file is not a valid BeOS .pkg package. PackageView No se puede leer el paquete.\nQuizás una de las razones es que el archivo solicitado no es un paquete .pkg válido de BeOS
data/catalogs/bin/dstcheck/es.catkeys
+2 -1
View File
@@ -1,4 +1,5 @@
1 spanish; castilian x-vnd.Haiku-cmd-dstconfig 2690010039
1 spanish; castilian x-vnd.Haiku-cmd-dstconfig 684321431
Ask me later dstcheck Preguntarme después
Manually adjust time… dstcheck Ajustar manualmente la hora...
Keep this time dstcheck Mantener esta hora
Attention!\n\nBecause of the switch from daylight saving time, your computer's clock may be an hour off.\nYour computer thinks it is %current time%.\n\nIs this the correct time? dstcheck ¡Atención!\n\nDebido al cambio del horario de verano, el reloj de su computadora puede estar una hora equivocado.\nEste equipo piensa que es %current time%.\n\n¿Es la hora correcta?
data/catalogs/kits/es.catkeys
+3 -1
View File
@@ -1,4 +1,4 @@
1 spanish; castilian x-vnd.Haiku-libbe 3211461559
1 spanish; castilian x-vnd.Haiku-libbe 3198309111
gamma AboutWindow gama
beta AboutWindow beta
%3.2f GiB StringForSize %3.2f GiB
@@ -18,6 +18,8 @@ OK PrintJob Aceptar
Green: ColorControl Verde:
Version history: AboutWindow Historal de versión:
Remove replicant Dragger Remover replicante
Select all TextView Seleccionar todo
OK AboutWindow Aceptar
OK ZombieReplicantView Aceptar
Print Server is not responding. PrintJob El servidor de impresión no responde.
Paste TextView Pegar
data/catalogs/preferences/mail/es.catkeys
+2 -1
View File
@@ -1,4 +1,4 @@
1 spanish; castilian x-vnd.Haiku-Mail 688530788
1 spanish; castilian x-vnd.Haiku-Mail 1807389802
Settings Config Window Configuración
Never Config Window show status window Nunca
While sending and receiving Config Window Mientras se envíe y reciba
@@ -18,6 +18,7 @@ Password: E-Mail Contraseña:
Accounts Config Window Cuentas
Finish AutoConfigWindow Terminar
Remove Config Window Eliminar
Error! Config Views ¡Error!
Server Name: E-Mail Nombre del servidor:
While sending Config Window Mientras se envia
Enter a valid e-mail address. AutoConfigWindow Introduzca una dirección de correo válida.
data/catalogs/preferences/media/be.catkeys
+1 -8
View File
@@ -1,21 +1,14 @@
1 belarusian x-vnd.Haiku-Media 4081089471
1 belarusian x-vnd.Haiku-Media 2605101563
Couldn't add volume control in Deskbar: %s\n Media views Не ўдалося дадаць элемент кіравання гучнасцю у Deskbar: %s\n
Ready for use… Media Window Гатовы да карыстання…
Video input: Media views Відэа ўваход:
Waiting for media_server to quit. Media Window Чакаецца выключэнне media_server.
Cleaning up. Media Window Прыборка.
Defaults Media views Прадвызначаныя
Stopping media server… Media Window Спыненне медыясервера…
Quit Media Window Выйсці
Starting media server… Media Window Запускаецца медыясервер…
Done shutting down. Media Window Медыясервер спынены.
Video settings Media Window Наладкі відэа
Video output: Media views Відэа Выхад:
Could not connect to the media server.\nWould you like to start it ? Media Window Немагчыма далучыцца да медыясервера.\n Жадаеце яго стартаваць ?
Restart media services Media views Перазапусціць медыясервер
Couldn't remove volume control in Deskbar: %s\n Media views Не ўдалося выдаліць элемент кіравання гучнасцю з Deskbar: %s\n
Media System name Медыя
Telling media_addon_server to quit. Media Window Адпраўка каманды выхаду да media_addon_server.
Audio mixer Media Window Аўдыё мікшар
This hardware has no controls. Media Window Гэтая апаратура не мае элементаў кіравання.
Audio output: Media views Гукавы выхад:
data/catalogs/preferences/media/de.catkeys
+1 -9
View File
@@ -1,23 +1,15 @@
1 german x-vnd.Haiku-Media 2163090586
1 german x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views Die Lautstärkeregelung konnte nicht in der Deskbar installiert werden: %s\n
Ready for use… Media Window Einsatzbereit…
Video input: Media views Video-Eingang:
Waiting for media_server to quit. Media Window Es wird auf die Beendigung des media_servers gewartet.
Cleaning up. Media Window Aufräumen.
Defaults Media views Standardwerte
MIDI Settings Media Window MIDI-Einstellungen
Stopping media server… Media Window Mediaserver wird angehalten…
Quit Media Window Beenden
Starting media server… Media Window Mediaserver wird gestartet…
Done shutting down. Media Window Herunterfahren beendet.
Video settings Media Window Video-Einstellungen
Video output: Media views Video-Ausgang:
Could not connect to the media server.\nWould you like to start it ? Media Window Verbindung mit dem Mediaserver fehlgeschlagen.\nSoll er gestartet werden?
Restart media services Media views Mediadienste neustarten
Couldn't remove volume control in Deskbar: %s\n Media views Die Lautstärkeregelung konnte nicht aus der Deskbar entfernt werden: %s\n
Media System name Audio & Video
Telling media_addon_server to quit. Media Window Media_addon_server wird aufgefordert sich zu beenden.
Media Service Media Window Mediadienste
Audio mixer Media Window Audiomixer
This hardware has no controls. Media Window Dieses Gerät hat keine Einstellmöglichkeiten.
Audio output: Media views Audio-Ausgang:
data/catalogs/preferences/media/eo.catkeys
+1 -8
View File
@@ -1,17 +1,10 @@
1 esperanto x-vnd.Haiku-Media 3056231296
Ready for use… Media Window Preta je uziĝi…
1 esperanto x-vnd.Haiku-Media 1580243388
Video input: Media views Videa enigo:
Waiting for media_server to quit. Media Window Atendo de la fino de la plurmedia servilo.
Cleaning up. Media Window Purigante.
Defaults Media views Aprioraj
Stopping media server… Media Window Halto de la plurmedia servilo…
Quit Media Window Eliri
Starting media server… Media Window Lanĉo de plurmedia servilo…
Done shutting down. Media Window Haltado kompleta.
Video output: Media views Videa eligo:
Could not connect to the media server.\nWould you like to start it ? Media Window Ne eblas konekti al la plurmedia servilo.\nĈu vi volas lanĉi ĝin?
Restart media services Media views Relanĉu la plurmediaj servoj
Telling media_addon_server to quit. Media Window Ordonante, ke la plurmedia aldona servilo finu.
This hardware has no controls. Media Window Ĉi-tiu aparato ne havas agordilojn.
Audio output: Media views Sona eligo:
Audio settings Media Window Sonaj agordoj
data/catalogs/preferences/media/es.catkeys
+1 -8
View File
@@ -1,21 +1,14 @@
1 spanish; castilian x-vnd.Haiku-Media 4081089471
1 spanish; castilian x-vnd.Haiku-Media 2605101563
Couldn't add volume control in Deskbar: %s\n Media views No se ha podido agregar el control de volumen en el Deskbar: %s\n
Ready for use… Media Window Listo para usar...
Video input: Media views Entrada de video:
Waiting for media_server to quit. Media Window Esperando que cierre el media_server. Para salir
Cleaning up. Media Window Limpiando.
Defaults Media views Predeterminados
Stopping media server… Media Window Deteniendo el servidor de media ...
Quit Media Window Salir
Starting media server… Media Window Iniciando el servidor de media…
Done shutting down. Media Window Apagado.
Video settings Media Window Configuración de video
Video output: Media views Salida de video:
Could not connect to the media server.\nWould you like to start it ? Media Window No se puede conectar con el servidor de media.\n¿Desea iniciarlo?
Restart media services Media views Reiniciar los servicios multimedia
Couldn't remove volume control in Deskbar: %s\n Media views No se ha podido remover el control de volumen en el Deskbar: %s\n
Media System name Media
Telling media_addon_server to quit. Media Window Solicitando al media_addon_server que termine.
Audio mixer Media Window Mezclador de audio
This hardware has no controls. Media Window Este dispositivo no tiene controles.
Audio output: Media views Salida de audio:
data/catalogs/preferences/media/fi.catkeys
+1 -9
View File
@@ -1,23 +1,15 @@
1 finnish x-vnd.Haiku-Media 2163090586
1 finnish x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views Voimakkuussäätimen lisääminen Työpöytäpalkkiin epäonnistui: %s\n
Ready for use… Media Window Valmis käytettäväksi…
Video input: Media views Videosyöte:
Waiting for media_server to quit. Media Window Odotetaan media_server-palvelimen lopettamista.
Cleaning up. Media Window Tyhjennetään.
Defaults Media views Oletukset
MIDI Settings Media Window MIDI-asetukset
Stopping media server… Media Window Pysäytetään mediapalvelin…
Quit Media Window Lopeta
Starting media server… Media Window Käynnistetään mediapalvelin…
Done shutting down. Media Window Sulkeminen toteutettu.
Video settings Media Window Videoasetukset
Video output: Media views Videotuloste:
Could not connect to the media server.\nWould you like to start it ? Media Window Yhdistäminen mediapalvelimeen epäonnistui.\nHaluaisitko käynnistää sen nyt ?
Restart media services Media views Käynnistä mediapalvelut uudelleen
Couldn't remove volume control in Deskbar: %s\n Media views Voimakkuussäätimen poistaminen Työpöytäpalkista epäonnistui: %s\n
Media System name Media-asetukset
Telling media_addon_server to quit. Media Window Kehoitetaan media_addon_server-palvelinta lopettamaan.
Media Service Media Window Media-palvelu
Audio mixer Media Window Äänisekoitin
This hardware has no controls. Media Window Tässä laitteistossa ei ole ohjaimia.
Audio output: Media views Äänituloste:
data/catalogs/preferences/media/fr.catkeys
+1 -9
View File
@@ -1,23 +1,15 @@
1 french x-vnd.Haiku-Media 2163090586
1 french x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views Impossible d’insérer le contrôle du volume dans la Deskbar : %s\n
Ready for use… Media Window Prêt à servir…
Video input: Media views Entrée vidéo :
Waiting for media_server to quit. Media Window Attente de la fin du serveur de médias.
Cleaning up. Media Window Nettoyage.
Defaults Media views Par défaut
MIDI Settings Media Window Réglages MIDI
Stopping media server… Media Window Arrêt du serveur de médias…
Quit Media Window Quitter
Starting media server… Media Window Démarrage du serveur de médias…
Done shutting down. Media Window Arrêt terminé.
Video settings Media Window Réglages vidéo
Video output: Media views Sortie vidéo :
Could not connect to the media server.\nWould you like to start it ? Media Window Impossible de se connecter au serveur de médias.\nVoulez-vous le démarrer ?
Restart media services Media views Redémarrer les services médias
Couldn't remove volume control in Deskbar: %s\n Media views Impossible de retirer le contrôle du volume de la Deskbar : %s\n
Media System name Média
Telling media_addon_server to quit. Media Window Demande au serveur des extensions de médias de quitter.
Media Service Media Window Service Media
Audio mixer Media Window Mélangeur audio
This hardware has no controls. Media Window Ce matériel n’a pas de contrôles.
Audio output: Media views Sortie audio :
data/catalogs/preferences/media/hr.catkeys
+1 -3
View File
@@ -1,7 +1,5 @@
1 croatian x-vnd.Haiku-Media 3028864262
Ready for use… Media Window Spremno za upotrebu...
1 croatian x-vnd.Haiku-Media 1991151343
Video input: Media views Video ulaz:
Cleaning up. Media Window Čistim.
Defaults Media views Zadano
Quit Media Window Završi
Video settings Media Window Video postavke
data/catalogs/preferences/media/hu.catkeys
+1 -9
View File
@@ -1,23 +1,15 @@
1 hungarian x-vnd.Haiku-Media 2163090586
1 hungarian x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views Nem lehetett hangerőszabályzót helyezni az Asztalsávra: %s\n
Ready for use… Media Window Használatra kész…
Video input: Media views Képbemenet:
Waiting for media_server to quit. Media Window Várakozás a Médiakiszolgáló kilépésére.
Cleaning up. Media Window Rendrakás.
Defaults Media views Alapértelmezések
MIDI Settings Media Window MIDI beállítások
Stopping media server… Media Window Médiakiszolgáló leállítása…
Quit Media Window Kilépés
Starting media server… Media Window Médiakiszolgáló elindítása…
Done shutting down. Media Window Leállítva.
Video settings Media Window Videóbeállítások
Video output: Media views Képkimenet:
Could not connect to the media server.\nWould you like to start it ? Media Window Nem lehet csatlakozni a Médiakiszolgálóhoz.\nEl szeretné indítani most?
Restart media services Media views Médiaszolgáltatások újraindítása
Couldn't remove volume control in Deskbar: %s\n Media views Nem lehetett a hangerőszabályzót eltávolítani az Asztalsávról: %s\n
Media System name Média
Telling media_addon_server to quit. Media Window A Médiabővítmény-kiszolgáló leállítása.
Media Service Media Window Média szolgáltatás
Audio mixer Media Window Hangerőszabályzó
This hardware has no controls. Media Window Ennek az eszköznek nincsenek vezérlői.
Audio output: Media views Hangkimenet:
data/catalogs/preferences/media/it.catkeys
+1 -9
View File
@@ -1,23 +1,15 @@
1 italian x-vnd.Haiku-Media 2163090586
1 italian x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views Non è stato possibile aggiungere il controllo del volume nella Deskbar: %s\n
Ready for use… Media Window Pronto all'uso…
Video input: Media views Ingresso Video:
Waiting for media_server to quit. Media Window In attesa della chiusura di media_server.
Cleaning up. Media Window Pulizia in corso.
Defaults Media views Predefiniti
MIDI Settings Media Window Impostazioni MIDI
Stopping media server… Media Window Arresto di media server in corso…
Quit Media Window Esci
Starting media server… Media Window Avvio di media server in corso…
Done shutting down. Media Window Spegnimento effettuato.
Video settings Media Window Impostazioni video
Video output: Media views Uscita Video:
Could not connect to the media server.\nWould you like to start it ? Media Window Impossibile connettersi al media server.\nAvviarlo?
Restart media services Media views Riavvio servizi media
Couldn't remove volume control in Deskbar: %s\n Media views Non è stato possibile rimuovere il controllo del volume nella Deskbar: %s\n
Media System name Media
Telling media_addon_server to quit. Media Window Inviata richiesta di chiusura a media_addon_server.
Media Service Media Window Servizio Media
Audio mixer Media Window Mixer audio
This hardware has no controls. Media Window Questo hardware non possiede controlli.
Audio output: Media views Uscite Audio:
data/catalogs/preferences/media/ja.catkeys
+1 -9
View File
@@ -1,23 +1,15 @@
1 japanese x-vnd.Haiku-Media 2163090586
1 japanese x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views 音量コントロールを Deskbar に追加できませんでした: %s\n
Ready for use… Media Window 使用可能…
Video input: Media views ビデオ入力:
Waiting for media_server to quit. Media Window media_server の終了を待機中…
Cleaning up. Media Window 整理中…
Defaults Media views デフォルト
MIDI Settings Media Window MIDI 設定
Stopping media server… Media Window メディアサーバーを終了しています…
Quit Media Window 終了
Starting media server… Media Window メディアサーバーを再起動中…
Done shutting down. Media Window シャットダウン完了。
Video settings Media Window ビデオ設定
Video output: Media views ビデオ出力:
Could not connect to the media server.\nWould you like to start it ? Media Window メディアサーバーに接続できませんでした。\nメディアサーバーを起動しますか？
Restart media services Media views メディアサービスを再起動
Couldn't remove volume control in Deskbar: %s\n Media views 音量コントロールを Deskbar から削除できませんでした: %s\n
Media System name メディア
Telling media_addon_server to quit. Media Window media_addon_server を終了させようとしています。
Media Service Media Window メディアサービス
Audio mixer Media Window オーディオミキサー
This hardware has no controls. Media Window このハードウェアにはコントロールがありません。
Audio output: Media views オーディオ出力:
data/catalogs/preferences/media/lt.catkeys
+1 -8
View File
@@ -1,21 +1,14 @@
1 lithuanian x-vnd.Haiku-Media 4081089471
1 lithuanian x-vnd.Haiku-Media 2605101563
Couldn't add volume control in Deskbar: %s\n Media views Nepavyko garso valdiklio patalpinti pranešimų srityje: %s\n
Ready for use… Media Window Pasirengta naudojimui…
Video input: Media views Vaizdo įvestis:
Waiting for media_server to quit. Media Window Laikiama, kol įvairialypės terpės tarnyba (media_server) baigs darbą.
Cleaning up. Media Window Apsitvarkoma.
Defaults Media views Numatytosios reikšmės
Stopping media server… Media Window Stabdoma įvairialypės terpės tarnyba…
Quit Media Window Baigti darbą
Starting media server… Media Window Paleidžiama įvairialypės terpės tarnyba…
Done shutting down. Media Window Išjungta.
Video settings Media Window Vaizdo nuostatos
Video output: Media views Vaizdo išvestis:
Could not connect to the media server.\nWould you like to start it ? Media Window Nepavyko prisijungti prie įvairialypės terpės tarnybos.\nAr norite, kad ji būtų paleista?
Restart media services Media views Perleisti įvairialypės terpės tarnybas
Couldn't remove volume control in Deskbar: %s\n Media views Nepavyko garso valdiklio pašalinti iš pranešimų srities: %s\n
Media System name Įvairialypė terpė
Telling media_addon_server to quit. Media Window Išjungiama įvairialypės terpės papildinių tarnyba (media_addon_server).
Audio mixer Media Window Garsų maišiklis
This hardware has no controls. Media Window Ši aparatūra nederinama.
Audio output: Media views Garso išvestis:
data/catalogs/preferences/media/nl.catkeys
+1 -8
View File
@@ -1,21 +1,14 @@
1 dutch; flemish x-vnd.Haiku-Media 4081089471
1 dutch; flemish x-vnd.Haiku-Media 2605101563
Couldn't add volume control in Deskbar: %s\n Media views De volumebesturing kon niet aan Deskbar worden toegevoegd: %s\n
Ready for use… Media Window Klaar voor gebruik...
Video input: Media views Video-invoer:
Waiting for media_server to quit. Media Window Wachten op afsluiting van media_server.
Cleaning up. Media Window Bezig met opschonen.
Defaults Media views Standaardwaarden
Stopping media server… Media Window Mediaserver stoppen…
Quit Media Window Afsluiten
Starting media server… Media Window Mediaserver starten…
Done shutting down. Media Window Uitzetten voltooid.
Video settings Media Window Video-instellingen
Video output: Media views Video-output:
Could not connect to the media server.\nWould you like to start it ? Media Window Kon geen verbinding met mediaserver maken.\nWilt u hem starten?
Restart media services Media views Mediaservices herstarten
Couldn't remove volume control in Deskbar: %s\n Media views De volumebesturing kon niet van de Deskbar verwijderd worden: %s\n
Media System name Media
Telling media_addon_server to quit. Media Window media_addon_server laten afsluiten.
Audio mixer Media Window Audiomixer
This hardware has no controls. Media Window Deze hardware heeft geen bedieningselementen.
Audio output: Media views Audio-output:
data/catalogs/preferences/media/pl.catkeys
+1 -9
View File
@@ -1,23 +1,15 @@
1 polish x-vnd.Haiku-Media 2163090586
1 polish x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views Nie można dodać sterowania głośnością w Deskbarze: %s\n
Ready for use… Media Window Gotowe do użycia…
Video input: Media views Wejście wideo:
Waiting for media_server to quit. Media Window Oczekiwanie na zakończenie działania media_server.
Cleaning up. Media Window Czyszczenie.
Defaults Media views Przywróć domyślne
MIDI Settings Media Window Ustawienia MIDI
Stopping media server… Media Window Zatrzymywanie serwera multimediów…
Quit Media Window Zakończ
Starting media server… Media Window Uruchamianie serwera multimediów…
Done shutting down. Media Window Skończono zamykanie.
Video settings Media Window Ustawienia wideo
Video output: Media views Wyjście wideo:
Could not connect to the media server.\nWould you like to start it ? Media Window Nie można połączyć się z serwerem multimediów.\nUruchomić go ponownie?
Restart media services Media views Ponowne uruchomienie usług multimedialnych
Couldn't remove volume control in Deskbar: %s\n Media views Nie można usunąć sterowania głośnością w Deskbarze: %s\n
Media System name Nośnik
Telling media_addon_server to quit. Media Window Powiadamianie media_addon_server, by się zakończył.
Media Service Media Window Usługa mediów
Audio mixer Media Window Mikser audio
This hardware has no controls. Media Window Ten sprzęt nie ma żadnych ustawień.
Audio output: Media views Wyjście dźwięku:
data/catalogs/preferences/media/pt_BR.catkeys
+1 -8
View File
@@ -1,21 +1,14 @@
1 portuguese (brazil) x-vnd.Haiku-Media 4081089471
1 portuguese (brazil) x-vnd.Haiku-Media 2605101563
Couldn't add volume control in Deskbar: %s\n Media views Não foi possível adicionar controle de volume ao Deskbar: %s\n
Ready for use… Media Window Pronto para usar...
Video input: Media views Entrada de vídeo:
Waiting for media_server to quit. Media Window Esperando que o servidor de mídia termine.
Cleaning up. Media Window Limpando.
Defaults Media views Padrões
Stopping media server… Media Window Parando o servidor de mídia...
Quit Media Window Sair
Starting media server… Media Window Iniciando o servidor multimídia...
Done shutting down. Media Window Desligado.
Video settings Media Window Definições de vídeo
Video output: Media views Saída de vídeo:
Could not connect to the media server.\nWould you like to start it ? Media Window Não foi possível conectar ao servidor de mídia.\nVocê gostaria de iniciá-lo?
Restart media services Media views Reiniciar serviços multimídia
Couldn't remove volume control in Deskbar: %s\n Media views Não foi possível remover o controle de volume no Deskbar: %s\n
Media System name Mídia
Telling media_addon_server to quit. Media Window Falando para o servidor adicional de media para terminar.
Audio mixer Media Window Misturador de áudio
This hardware has no controls. Media Window Este hardware não tem controles.
Audio output: Media views Saída de áudio:
data/catalogs/preferences/media/ro.catkeys
+1 -7
View File
@@ -1,21 +1,15 @@
1 romanian x-vnd.Haiku-Media 1716333833
1 romanian x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views Nu s-a putut adăuga controlul de volum pe bara de desktop: %s\n
Ready for use… Media Window Gata de utilizat...
Video input: Media views Intrare video:
Waiting for media_server to quit. Media Window Se așteaptă ca media_server să se închidă.
Cleaning up. Media Window Se curăță.
Defaults Media views Implicite
MIDI Settings Media Window Configurări MIDI
Stopping media server… Media Window Se oprește serverul media...
Quit Media Window Părăsește
Starting media server… Media Window Se pornește serverul media...
Video settings Media Window Configurări video
Video output: Media views Ieșire video:
Could not connect to the media server.\nWould you like to start it ? Media Window Nu s-a putut conecta la serverul media.\nDoriți să îl porniți?
Restart media services Media views Restartează servicii media
Couldn't remove volume control in Deskbar: %s\n Media views Nu s-a putut elimina controlul de volum de pe bara de desktop: %s\n
Media System name Media
Telling media_addon_server to quit. Media Window Se transmite lui media_addon_server să se închidă.
Audio mixer Media Window Mixaj audio
This hardware has no controls. Media Window Acest hardware nu are controale.
Audio output: Media views Ieșire audio:
data/catalogs/preferences/media/ru.catkeys
+1 -9
View File
@@ -1,23 +1,15 @@
1 russian x-vnd.Haiku-Media 2163090586
1 russian x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views Не удалось добавить регулятор громкости в Deskbar: %s\n
Ready for use… Media Window Готов к использованию…
Video input: Media views Видео вход:
Waiting for media_server to quit. Media Window Ожидание выключения медиасервера.
Cleaning up. Media Window Очистка.
Defaults Media views По умолчанию
MIDI Settings Media Window Настройки MIDI
Stopping media server… Media Window Остановка медиасервера…
Quit Media Window Выход
Starting media server… Media Window Запуск медиасервера…
Done shutting down. Media Window Остановка завершена.
Video settings Media Window Настройки видео
Video output: Media views Видео выход:
Could not connect to the media server.\nWould you like to start it ? Media Window Невозможно подключиться к медиа серверу.\nХотите запустить его?
Restart media services Media views Перезапустить медиа службы
Couldn't remove volume control in Deskbar: %s\n Media views Не удалось удалить регулятор громкости из Deskbar: %s\n
Media System name Медиа
Telling media_addon_server to quit. Media Window Запрос завершения работы media_addon_server.
Media Service Media Window Медиасервер
Audio mixer Media Window Микшер
This hardware has no controls. Media Window Это оборудование не имеет параметров настройки.
Audio output: Media views Аудио выход:
data/catalogs/preferences/media/sk.catkeys
+1 -8
View File
@@ -1,21 +1,14 @@
1 slovak x-vnd.Haiku-Media 4081089471
1 slovak x-vnd.Haiku-Media 2605101563
Couldn't add volume control in Deskbar: %s\n Media views Nepodarilo sa pridať ovládanie hlasitosti do Panela: %s\n
Ready for use… Media Window Pripravený na použitie…
Video input: Media views Video vstup:
Waiting for media_server to quit. Media Window Čaká sa na ukončenie media_server.
Cleaning up. Media Window Prebieha upratovanie.
Defaults Media views Predvolené
Stopping media server… Media Window Zastavuje sa multimediálny server…
Quit Media Window Ukončiť
Starting media server… Media Window Spúšťa sa multimediálny server…
Done shutting down. Media Window Vypínanie dokončené.
Video settings Media Window Video nastavenia
Video output: Media views Video výstup:
Could not connect to the media server.\nWould you like to start it ? Media Window Nepodarilo sa pripojiť k multimediálnemu serveru.\nChcete ho spustiť?
Restart media services Media views Reštartovať multimediálne služby
Couldn't remove volume control in Deskbar: %s\n Media views Nepodarilo sa odstrániť ovládanie hlasitosti z Panela: %s\n
Media System name Multimédiá
Telling media_addon_server to quit. Media Window Poslaná žiadosť o ukončenie media_addon_server.
Audio mixer Media Window Zmiešavač zvuku
This hardware has no controls. Media Window Tento hardvér nemá žiadne ovládacie prvky.
Audio output: Media views Zvukový výstup:
data/catalogs/preferences/media/sv.catkeys
+1 -9
View File
@@ -1,23 +1,15 @@
1 swedish x-vnd.Haiku-Media 2163090586
1 swedish x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views Kunde inte lägga till volymkontroll i Deskbar: %s\n
Ready for use… Media Window Redo att användas…
Video input: Media views Videoingång:
Waiting for media_server to quit. Media Window Väntar på att mediaservern ska stängas ner.
Cleaning up. Media Window Städar upp.
Defaults Media views Förval
MIDI Settings Media Window MIDI Inställningar
Stopping media server… Media Window Avslutar mediaservern…
Quit Media Window Avsluta
Starting media server… Media Window Startar mediaservern…
Done shutting down. Media Window Färdigavslutad.
Video settings Media Window Videoinställningar
Video output: Media views Videoutgång:
Could not connect to the media server.\nWould you like to start it ? Media Window Kunde inte ansluta till mediaservern.\nVill du starta den ?
Restart media services Media views Starta om mediatjänsterna
Couldn't remove volume control in Deskbar: %s\n Media views Kunde inte ta bort volymkontrollen från Deskbar: %s\n
Media System name Media
Telling media_addon_server to quit. Media Window Säger till media_addon_server att avsluta.
Media Service Media Window Media tjänst
Audio mixer Media Window Ljudmixer
This hardware has no controls. Media Window Hårdvaran saknar kontroller.
Audio output: Media views Ljudutgång:
data/catalogs/preferences/media/uk.catkeys
+1 -8
View File
@@ -1,21 +1,14 @@
1 ukrainian x-vnd.Haiku-Media 4081089471
1 ukrainian x-vnd.Haiku-Media 2605101563
Couldn't add volume control in Deskbar: %s\n Media views Неможливо додати регулятор гучності в Deskbar: %s\n
Ready for use… Media Window Готовий для використання…
Video input: Media views Вхід відео:
Waiting for media_server to quit. Media Window Зачекайте на вихід з Медіа Сервера.
Cleaning up. Media Window Очистити.
Defaults Media views По замовчуванню
Stopping media server… Media Window Зупинка Медіа Сервера…
Quit Media Window Вихід
Starting media server… Media Window Запуск Медіа Сервера…
Done shutting down. Media Window Відбувається закриття.
Video settings Media Window Налаштування відео
Video output: Media views Вивід відео:
Could not connect to the media server.\nWould you like to start it ? Media Window Медіа сервер не запущено\nЗапустити його?
Restart media services Media views Перезапустити медіа сервіси
Couldn't remove volume control in Deskbar: %s\n Media views Неможливо видалити регулятор гучності з Deskbar: %s\n
Media System name Mедіа
Telling media_addon_server to quit. Media Window Сказати медіасервер аддону про вихід.
Audio mixer Media Window Аудіо міксер
This hardware has no controls. Media Window Це залізо не регулюється.
Audio output: Media views Вивід аудіо:
data/catalogs/preferences/media/zh_Hans.catkeys
+1 -9
View File
@@ -1,23 +1,15 @@
1 english x-vnd.Haiku-Media 2163090586
1 english x-vnd.Haiku-Media 862832618
Couldn't add volume control in Deskbar: %s\n Media views 无法添加音量控件到桌面栏：%s\n
Ready for use… Media Window 准备使用…
Video input: Media views 视频输入:
Waiting for media_server to quit. Media Window 等待 media_server 退出。
Cleaning up. Media Window 清除。
Defaults Media views 默认
MIDI Settings Media Window MIDI 设置
Stopping media server… Media Window 暂停 media server…
Quit Media Window 退出
Starting media server… Media Window 启动 media server…
Done shutting down. Media Window 已关闭。
Video settings Media Window 视频设置
Video output: Media views 视频输出：
Could not connect to the media server.\nWould you like to start it ? Media Window 链接 media server 失败.\n是否重新启动 ?
Restart media services Media views 重启多媒体服务
Couldn't remove volume control in Deskbar: %s\n Media views 无法移除桌面栏中的音量控件：%s\n
Media System name 多媒体
Telling media_addon_server to quit. Media Window 控制 media_addon_server 退出程序。
Media Service Media Window 多媒体服务
Audio mixer Media Window 音频混合器
This hardware has no controls. Media Window 硬件控制失败。
Audio output: Media views 音频输出：
data/catalogs/preferences/printers/es.catkeys
+2 -1
View File
@@ -1,4 +1,4 @@
1 spanish; castilian x-vnd.Be-PRNT 200447094
1 spanish; castilian x-vnd.Be-PRNT 2163275033
Printer: %printer_name%\nDriver: %driver%\n TestPageView Impresora: %printer_name%\nControlador: %driver%\n
Waiting JobListView Espera
Print test page PrintersWindow Página de impresión de prueba
@@ -9,6 +9,7 @@ Cancel AddPrinterDialog Cancelar
Add printer AddPrinterDialog Añadir impresora
Green TestPageView Verde
Printers PrintersWindow Impresoras
Add… PrintersWindow Añadir…
Default Printer PrinterListView Impresora por defecto
Transport: %transport% %transport_address% PrinterListView Medio: %transport% %transport_address%
No pending jobs. PrinterListView No hay trabajos pendientes
data/launch/system
+3
View File
@@ -32,6 +32,9 @@ service x-vnd.Haiku-media_server {
launch /system/servers/media_server
no_safemode
legacy
on {
initial_volumes_mounted
}
}
service x-vnd.Haiku-midi_server {
docs/user/support/Referenceable.dox
+2 -2
View File
@@ -28,7 +28,7 @@
The C++ language provides two main ways of allocating objects: on the stack,
and on the heap. Objects created on the heap must be managed by the
application and deleted when they are not needed. Objects allocatede on the
application and deleted when they are not needed. Objects allocated on the
stack have a lifetime limited to the execution of the block they are
declared in.
@@ -197,7 +197,7 @@
The reference to the previously targetted object is released.
A reference to the new object is acquired only if \p alreadyHasReference
is true.
is false.
*/
headers/libs/agg/agg_conv_curve.h
+7 -4
View File
@@ -23,6 +23,9 @@
#include "agg_basics.h"
#include "agg_curves.h"
#include <cmath>
namespace agg
{
@@ -165,8 +168,8 @@ namespace agg
case path_cmd_curve3:
m_source->vertex(&end_x, &end_y);
if (!isnan(m_last_x) && !isnan(m_last_y) && !isnan(*x) && !isnan(*y)
&& !isnan(end_x) && !isnan(end_y)) {
if (!std::isnan(m_last_x) && !std::isnan(m_last_y) && !std::isnan(*x)
&& !std::isnan(*y) && !std::isnan(end_x) && !std::isnan(end_y)) {
m_curve3.init(m_last_x, m_last_y,
*x, *y,
end_x, end_y);
@@ -181,8 +184,8 @@ namespace agg
m_source->vertex(&ct2_x, &ct2_y);
m_source->vertex(&end_x, &end_y);
if (!isnan(m_last_x) && !isnan(m_last_y) && !isnan(*x) && !isnan(*y)
&& !isnan(end_x) && !isnan(end_y)) {
if (!std::isnan(m_last_x) && !std::isnan(m_last_y) && !std::isnan(*x)
&& !std::isnan(*y) && !std::isnan(end_x) && !std::isnan(end_y)) {
m_curve4.init(m_last_x, m_last_y,
*x, *y,
ct2_x, ct2_y,
headers/os/interface/Alert.h
+77 -56
View File
@@ -1,11 +1,13 @@
/*
* Copyright 2001-2014 Haiku, Inc. All rights reserved.
* Copyright 2001-2015 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ALERT_H
#define _ALERT_H
#include <vector>
#include <Window.h>
@@ -26,78 +28,97 @@ enum button_spacing {
class BBitmap;
class BButton;
class BGroupLayout;
class BInvoker;
class BTextView;
class TAlertView;
class BAlert : public BWindow {
public:
BAlert(const char* title, const char* text,
const char* button1, const char* button2 = NULL,
const char* button3 = NULL,
button_width width = B_WIDTH_AS_USUAL,
alert_type type = B_INFO_ALERT);
BAlert(const char* title, const char* text,
const char* button1, const char* button2,
const char* button3, button_width width,
button_spacing spacing,
alert_type type = B_INFO_ALERT);
virtual ~BAlert();
BAlert();
BAlert(const char* title, const char* text,
const char* button1,
const char* button2 = NULL,
const char* button3 = NULL,
button_width width = B_WIDTH_AS_USUAL,
alert_type type = B_INFO_ALERT);
BAlert(const char* title, const char* text,
const char* button1, const char* button2,
const char* button3, button_width width,
button_spacing spacing,
alert_type type = B_INFO_ALERT);
BAlert(BMessage* data);
virtual ~BAlert();
// Archiving
BAlert(BMessage* data);
static BArchivable *Instantiate(BMessage* data);
virtual status_t Archive(BMessage* data, bool deep = true) const;
// Archiving
static BArchivable* Instantiate(BMessage* data);
virtual status_t Archive(BMessage* data, bool deep = true) const;
// BAlert guts
void SetShortcut(int32 button_index, char key);
char Shortcut(int32 button_index) const;
// BAlert guts
alert_type Type() const;
void SetType(alert_type type);
void SetIcon(BBitmap* bitmap);
void SetText(const char* text);
void SetButtonSpacing(button_spacing spacing);
void SetButtonWidth(button_width width);
int32 Go();
status_t Go(BInvoker* invoker);
void SetShortcut(int32 buttonIndex, char key);
char Shortcut(int32 buttonIndex) const;
virtual void MessageReceived(BMessage* message);
virtual void FrameResized(float new_width, float new_height);
BButton* ButtonAt(int32 index) const;
BTextView* TextView() const;
int32 Go();
status_t Go(BInvoker* invoker);
virtual BHandler* ResolveSpecifier(BMessage* message, int32 index,
BMessage* specifier, int32 what,
const char* property);
virtual status_t GetSupportedSuites(BMessage* data);
virtual void MessageReceived(BMessage* message);
virtual void FrameResized(float newWidth, float newHeight);
virtual void DispatchMessage(BMessage* message, BHandler* handler);
virtual void Quit();
virtual bool QuitRequested();
void AddButton(const char* label, char key = 0);
int32 CountButtons() const;
BButton* ButtonAt(int32 index) const;
static BPoint AlertPosition(float width, float height);
BTextView* TextView() const;
virtual status_t Perform(perform_code d, void* arg);
virtual BHandler* ResolveSpecifier(BMessage* message, int32 index,
BMessage* specifier, int32 form,
const char* property);
virtual status_t GetSupportedSuites(BMessage* data);
virtual void DispatchMessage(BMessage* message,
BHandler* handler);
virtual void Quit();
virtual bool QuitRequested();
virtual status_t Perform(perform_code d, void* arg);
static BPoint AlertPosition(float width, float height);
private:
friend class _BAlertFilter_;
virtual void _ReservedAlert1();
virtual void _ReservedAlert2();
virtual void _ReservedAlert3();
virtual void _ReservedAlert1();
virtual void _ReservedAlert2();
virtual void _ReservedAlert3();
void _Init(const char* text, const char* button1,
const char* button2, const char* button3,
button_width width, button_spacing spacing,
alert_type type);
BBitmap* _CreateTypeIcon();
BButton* _CreateButton(int32 which, const char* label);
void _Prepare();
void _InitObject(const char* text, const char* button1,
const char* button2 = NULL,
const char* button3 = NULL,
button_width width = B_WIDTH_AS_USUAL,
button_spacing spacing = B_EVEN_SPACING,
alert_type type = B_INFO_ALERT);
BBitmap* _InitIcon();
BButton* _CreateButton(int32 which, const char* label);
sem_id fAlertSem;
int32 fAlertValue;
BButton* fButtons[3];
BTextView* fTextView;
char fKeys[3];
alert_type fMsgType;
button_width fButtonWidth;
BInvoker* fInvoker;
uint32 _reserved[4];
private:
sem_id fAlertSem;
int32 fAlertValue;
TAlertView* fIconView;
BTextView* fTextView;
BGroupLayout* fButtonLayout;
std::vector<BButton*> fButtons;
std::vector<char> fKeys;
uint8 fType;
uint8 fButtonSpacing;
uint8 fButtonWidth;
BInvoker* fInvoker;
uint32 _reserved[1];
};
#endif // _ALERT_H
headers/os/interface/Window.h
+1
View File
@@ -165,6 +165,7 @@ public:
void MoveTo(float x, float y);
void ResizeBy(float dx, float dy);
void ResizeTo(float width, float height);
void ResizeToPreferred();
void CenterIn(const BRect& rect);
void CenterOnScreen();
headers/os/media/MediaDefs.h
+12 -2
View File
@@ -787,11 +787,21 @@ struct buffer_clone_info;
// media_server and it's friends. You can provide a call back hook which
// will be called during various steps of the process. This callback should
// currently always return TRUE. A 'stage' value of 100 means the process is
// completely finished.
// completely finished. Differently from BeOS the functions automatically
// send notifications to the Deskbar if not differently specified.
// It's also provided a new version of launch_media_server allowing
// to specify a custom callback for notifications.
// Deprecated
status_t launch_media_server(uint32 flags);
status_t launch_media_server(bigtime_t timeout = B_INFINITE_TIMEOUT,
bool (*progress)(int stage, const char* message, void* cookie) = NULL,
void* cookie = NULL, uint32 flags = 0);
status_t shutdown_media_server(bigtime_t timeout = B_INFINITE_TIMEOUT,
bool (*progress)(int stage, const char* message, void* cookie) = NULL,
void* cookie = NULL);
status_t launch_media_server(uint32 flags = 0);
// Given an image_id, prepare that image_id for realtime media
headers/os/media/TimedEventQueue.h
+1 -2
View File
@@ -38,9 +38,8 @@ struct media_timed_event {
int32 data;
int64 bigdata;
char user_data[64];
bigtime_t queued_time; // Real time when put in queue
uint32 _reserved_media_timed_event_[6];
uint32 _reserved_media_timed_event_[8];
};
headers/os/net/HttpForm.h
+4
View File
@@ -32,7 +32,11 @@ private:
// but never used (see BHttpForm::operator[] which does the necessary
// check up)
BHttpFormData();
#if __GNUC__ >= 6
friend class std::pair<const BString, BHttpFormData>;
#else
friend class std::map<BString, BHttpFormData>;
#endif
public:
BHttpFormData(const BString& name,
headers/private/kernel/boot/stdio.h
+30
View File
@@ -8,6 +8,8 @@
#include <stdarg.h>
typedef off_t fpos_t;
#ifdef __cplusplus
extern "C" {
#endif
@@ -46,6 +48,34 @@ extern int vsnprintf(char *str, size_t size, char const *format, va_list ap);
extern int vasprintf(char **ret, char const *format, va_list ap);
// ToDo: not everything is or should be implemented here
extern void clearerr(FILE *stream);
extern int fclose(FILE *stream);
extern int feof(FILE *stream);
extern int ferror(FILE *stream);
extern int fflush(FILE *stream);
extern int fgetpos(FILE *stream, fpos_t *position);
extern FILE *fopen(const char *name, const char *mode);
extern size_t fread(void *buffer, size_t size, size_t numItems, FILE *stream);
extern FILE *freopen(const char *name, const char *mode, FILE *stream);
extern int fscanf(FILE *stream, char const *format, ...);
extern int fseek(FILE *stream, long offset, int seekType);
extern int fsetpos(FILE *stream, const fpos_t *position);
extern long ftell(FILE *stream);
extern size_t fwrite(const void *buffer, size_t size, size_t numItems, FILE *stream);
extern void perror(const char *errorPrefix);
extern int rename(const char *from, const char *to);
extern void rewind(FILE *stream);
extern int scanf(char const *format, ...);
extern void setbuf (FILE *file, char *buff);
extern int setvbuf(FILE *file, char *buff, int mode, size_t size);
extern int sscanf(char const *str, char const *format, ...);
extern FILE *tmpfile(void);
extern char *tmpnam(char *nameBuffer);
extern int ungetc(int c, FILE *stream);
extern int vscanf(char const *format, va_list ap);
extern int vsscanf(char const *str, char const *format, va_list ap);
extern int vfscanf(FILE *stream, char const *format, va_list ap);
extern int fgetc(FILE *);
extern char *fgets(char *, int, FILE *);
extern int fputc(int, FILE *);
headers/private/kernel/file_cache.h
+1 -1
View File
@@ -20,7 +20,7 @@
#define CACHE_MODULES_NAME "file_cache"
#define FILE_CACHE_SEQUENTIAL_ACCESS 0x01
#define FILE_CACHE_LOADED_COMPLETELY 0x02
#define FILE_CACHE_LOADED_COMPLETELY 0x02
#define FILE_CACHE_NO_IO 0x04
struct cache_module_info {
headers/private/kernel/util/BitUtils.h
+1 -1
View File
@@ -56,5 +56,5 @@ log2(uint32 v)
}
#endif // KERNEL_UTIL_RANDOM_H
#endif // KERNEL_UTIL_BITUTIL_H
headers/private/kernel/util/Constructor.h
+6 -6
View File
@@ -10,7 +10,7 @@ public:
typedef const DataType* ConstPointer;
typedef DataType& Reference;
typedef const DataType& ConstReference;
/*! Constructs the object pointed to by \a object via a
zero-parameter constructor.
*/
@@ -19,7 +19,7 @@ public:
if (object)
new(reinterpret_cast<void*>(object)) DataType();
}
/*! Constructs the object pointed to by \a object via a
one-parameter constructor using the given argument.
*/
@@ -29,7 +29,7 @@ public:
if (object)
new(reinterpret_cast<void*>(object)) DataType(arg1);
}
/*! Constructs the object pointed to by \a object via a
two-parameter constructor using the given arguments.
*/
@@ -39,7 +39,7 @@ public:
if (object)
new(reinterpret_cast<void*>(object)) DataType(arg1, arg2);
}
/*! Constructs the object pointed to by \a object via a
three-parameter constructor using the given arguments.
*/
@@ -49,7 +49,7 @@ public:
if (object)
new(reinterpret_cast<void*>(object)) DataType(arg1, arg2, arg3);
}
/*! Constructs the object pointed to by \a object via a
four-parameter constructor using the given arguments.
*/
@@ -60,7 +60,7 @@ public:
ArgType4 arg4) {
if (object)
new(reinterpret_cast<void*>(object)) DataType(arg1, arg2, arg3, arg4);
}
}
/*! Calls the destructor for the object pointed to be \a object.
*/
headers/private/kernel/util/MallocFreeAllocator.h
+2 -2
View File
@@ -12,14 +12,14 @@ public:
typedef const DataType* ConstPointer;
typedef DataType& Reference;
typedef const DataType& ConstReference;
/*! malloc()'s an object of type \c DataType and returns a
pointer to it.
*/
Pointer Allocate() {
return reinterpret_cast<Pointer>(malloc(sizeof(DataType)));
}
/*! free()'s the given object.
*/
void Deallocate(Pointer object) {
headers/private/kernel/util/OpenHashTable.h
+1 -1
View File
@@ -74,7 +74,7 @@ struct MallocAllocator {
* stored in a linked list. The table may be made to adjust its number of slots
* depending on the load factor (this should be enabled unless the object is to
* be used at times where memory allocations aren't possible, such as code
* called byt he memory allocator).
* called by the memory allocator).
*
* The link between entries is part of the ValueType stored items, which makes
* sure the table can always accept new items and will never fail because it is
headers/private/kernel/util/SplayTree.h
+12 -12
View File
@@ -117,7 +117,7 @@ public:
}
return node;
}
}
/*!
Remove from the tree.
@@ -143,7 +143,7 @@ public:
}
return true;
}
}
/*!
Find the smallest item in the tree.
@@ -163,9 +163,9 @@ public:
return node;
}
/*!
/*!
Find the largest item in the tree.
*/
*/
Node* FindMax()
{
if (fRoot == NULL)
@@ -179,9 +179,9 @@ public:
_Splay(Definition::GetKey(node));
return node;
}
}
/*!
/*!
Find an item in the tree.
*/
Node* Lookup(const Key& key)
@@ -192,14 +192,14 @@ public:
_Splay(key);
return Definition::Compare(key, fRoot) == 0 ? fRoot : NULL;
}
}
Node* Root() const
{
return fRoot;
}
/*!
/*!
Test if the tree is logically empty.
\return true if empty, false otherwise.
*/
@@ -267,16 +267,16 @@ private:
_Splay(key) does the splay operation on the given key.
If key is in the tree, then the node containing
that key becomes the root. If key is not in the tree,
that key becomes the root. If key is not in the tree,
then after the splay, key.root is either the greatest key
< key in the tree, or the least key > key in the tree.
This means, among other things, that if you splay with
a key that's larger than any in the tree, the rightmost
node of the tree becomes the root. This property is used
node of the tree becomes the root. This property is used
in the Remove() method.
*/
void _Splay(const Key& key) {
void _Splay(const Key& key) {
Link headerLink;
headerLink.left = headerLink.right = NULL;
@@ -554,7 +554,7 @@ public:
return fTree.Root();
}
/*!
/*!
Test if the tree is logically empty.
\return true if empty, false otherwise.
*/
headers/private/shared/Thread.h
+1 -7
View File
@@ -365,11 +365,6 @@ MouseDownThread<View>::MouseDownThread(View* view,
template<class View>
MouseDownThread<View>::~MouseDownThread()
{
if (fThreadID > 0) {
kill_thread(fThreadID);
// dead at this point
TRESPASS();
}
}
@@ -393,7 +388,6 @@ MouseDownThread<View>::TrackBinder(void* castToThis)
MouseDownThread* self = static_cast<MouseDownThread*>(castToThis);
self->Track();
// dead at this point
TRESPASS();
return B_OK;
}
@@ -427,9 +421,9 @@ MouseDownThread<View>::Track()
}
delete this;
ASSERT(!"should not be here");
}
} // namespace BPrivate
using namespace BPrivate;
src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
+245 -183
View File
@@ -37,8 +37,8 @@
// References:
// - RFC 793 - Transmission Control Protocol
// - RFC 813 - Window and Acknowledgement Strategy in TCP
// - RFC 793 - Transmission Control Protocol
// - RFC 813 - Window and Acknowledgement Strategy in TCP
// - RFC 1337 - TIME_WAIT Assassination Hazards in TCP
//
// Things this implementation currently doesn't implement:
@@ -60,16 +60,19 @@
#ifdef TRACE_TCP
// the space before ', ##args' is important in order for this to work with cpp 2.95
# define TRACE(format, args...) dprintf("%ld: TCP [%llu] %p (%12s) " \
format "\n", find_thread(NULL), system_time(), this, \
name_for_state(fState) , ##args)
# define TRACE(format, args...) dprintf("%" B_PRId32 ": TCP [%" \
B_PRIdBIGTIME "] %p (%12s) " format "\n", find_thread(NULL), \
system_time(), this, name_for_state(fState) , ##args)
#else
# define TRACE(args...) do { } while (0)
#endif
#ifdef PROBE_TCP
# define PROBE(buffer, window) \
dprintf("TCP PROBE %llu %s %s %ld snxt %lu suna %lu cw %lu sst %lu win %lu swin %lu smax-suna %lu savail %lu sqused %lu rto %llu\n", \
dprintf("TCP PROBE %" B_PRIdBIGTIME " %s %s %" B_PRIu32 " snxt %" B_PRIu32 \
" suna %" B_PRIu32 " cw %" B_PRIu32 " sst %" B_PRIu32 " win %" \
B_PRIu32 " swin %" B_PRIu32 " smax-suna %" B_PRIu32 " savail %" \
B_PRIuSIZE " sqused %" B_PRIuSIZE " rto %" B_PRIdBIGTIME "\n", \
system_time(), PrintAddress(buffer->source), \
PrintAddress(buffer->destination), buffer->size, fSendNext.Number(), \
fSendUnacknowledged.Number(), fCongestionWindow, fSlowStartThreshold, \
@@ -101,9 +104,10 @@ public:
virtual void AddDump(TraceOutput& out)
{
out.Print("tcp:%p (%12s) receive buffer %p (%lu bytes), flags %x, "
"seq %lu, ack %lu, wnd %lu", fEndpoint, name_for_state(fState),
fBuffer, fBufferSize, fFlags, fSequence, fAcknowledge, fWindow);
out.Print("tcp:%p (%12s) receive buffer %p (%" B_PRIu32 " bytes), "
"flags %#" B_PRIx8 ", seq %" B_PRIu32 ", ack %" B_PRIu32
", wnd %" B_PRIu32, fEndpoint, name_for_state(fState), fBuffer,
fBufferSize, fFlags, fSequence, fAcknowledge, fWindow);
}
protected:
@@ -137,10 +141,11 @@ public:
virtual void AddDump(TraceOutput& out)
{
out.Print("tcp:%p (%12s) send buffer %p (%lu bytes), flags %x, "
"seq %lu, ack %lu, first %lu, last %lu",
fEndpoint, name_for_state(fState), fBuffer, fBufferSize, fFlags,
fSequence, fAcknowledge, fFirstSequence, fLastSequence);
out.Print("tcp:%p (%12s) send buffer %p (%" B_PRIu32 " bytes), "
"flags %#" B_PRIx8 ", seq %" B_PRIu32 ", ack %" B_PRIu32
", first %" B_PRIu32 ", last %" B_PRIu32, fEndpoint,
name_for_state(fState), fBuffer, fBufferSize, fFlags, fSequence,
fAcknowledge, fFirstSequence, fLastSequence);
}
protected:
@@ -210,7 +215,7 @@ public:
virtual void AddDump(TraceOutput& out)
{
out.Print("tcp:%p (%12s) error at line %ld: %s", fEndpoint,
out.Print("tcp:%p (%12s) error at line %" B_PRId32 ": %s", fEndpoint,
name_for_state(fState), fLine, fError);
}
@@ -221,9 +226,34 @@ protected:
tcp_state fState;
};
class Timer : public AbstractTraceEntry {
class TimerSet : public AbstractTraceEntry {
public:
Timer(TCPEndpoint* endpoint, const char* which)
TimerSet(TCPEndpoint* endpoint, const char* which, bigtime_t timeout)
:
fEndpoint(endpoint),
fWhich(which),
fTimeout(timeout),
fState(endpoint->State())
{
Initialized();
}
virtual void AddDump(TraceOutput& out)
{
out.Print("tcp:%p (%12s) %s timer set to %" B_PRIdBIGTIME, fEndpoint,
name_for_state(fState), fWhich, fTimeout);
}
protected:
TCPEndpoint* fEndpoint;
const char* fWhich;
bigtime_t fTimeout;
tcp_state fState;
};
class TimerTriggered : public AbstractTraceEntry {
public:
TimerTriggered(TCPEndpoint* endpoint, const char* which)
:
fEndpoint(endpoint),
fWhich(which),
@@ -234,7 +264,30 @@ public:
virtual void AddDump(TraceOutput& out)
{
out.Print("tcp:%p (%12s) %s timer", fEndpoint,
out.Print("tcp:%p (%12s) %s timer triggered", fEndpoint,
name_for_state(fState), fWhich);
}
protected:
TCPEndpoint* fEndpoint;
const char* fWhich;
tcp_state fState;
};
class APICall : public AbstractTraceEntry {
public:
APICall(TCPEndpoint* endpoint, const char* which)
:
fEndpoint(endpoint),
fWhich(which),
fState(endpoint->State())
{
Initialized();
}
virtual void AddDump(TraceOutput& out)
{
out.Print("tcp:%p (%12s) api call: %s", fEndpoint,
name_for_state(fState), fWhich);
}
@@ -251,8 +304,6 @@ protected:
# define T(x)
#endif // TCP_TRACING
// Initial estimate for packet round trip time (RTT)
#define TCP_INITIAL_RTT 2000000
// constants for the fFlags field
enum {
@@ -268,7 +319,8 @@ enum {
};
static const int kTimestampFactor = 1024;
static const int kTimestampFactor = 1000;
// conversion factor between usec system time and msec tcp time
static inline bigtime_t
@@ -359,68 +411,10 @@ state_needs_finish(int32 state)
// #pragma mark -
WaitList::WaitList(const char* name)
{
fCondition = 0;
fSem = create_sem(0, name);
}
WaitList::~WaitList()
{
delete_sem(fSem);
}
status_t
WaitList::InitCheck() const
{
return fSem;
}
status_t
WaitList::Wait(MutexLocker& locker, bigtime_t timeout)
{
locker.Unlock();
status_t status = B_OK;
while (!atomic_test_and_set(&fCondition, 0, 1)) {
status = acquire_sem_etc(fSem, 1, B_ABSOLUTE_TIMEOUT | B_CAN_INTERRUPT,
timeout);
if (status != B_OK)
break;
}
locker.Lock();
return status;
}
void
WaitList::Signal()
{
atomic_or(&fCondition, 1);
#ifdef __HAIKU__
release_sem_etc(fSem, 1, B_DO_NOT_RESCHEDULE | B_RELEASE_ALL);
#else
int32 count;
if (get_sem_count(fSem, &count) == B_OK && count < 0)
release_sem_etc(fSem, -count, B_DO_NOT_RESCHEDULE);
#endif
}
// #pragma mark -
TCPEndpoint::TCPEndpoint(net_socket* socket)
:
ProtocolSocket(socket),
fManager(NULL),
fReceiveList("tcp receive"),
fSendList("tcp send"),
fOptions(0),
fSendWindowShift(0),
fReceiveWindowShift(0),
@@ -452,6 +446,9 @@ TCPEndpoint::TCPEndpoint(net_socket* socket)
// TODO: to be replaced with a real read/write locking strategy!
mutex_init(&fLock, "tcp lock");
fReceiveCondition.Init(this, "tcp receive");
fSendCondition.Init(this, "tcp send");
gStackModule->init_timer(&fPersistTimer, TCPEndpoint::_PersistTimer, this);
gStackModule->init_timer(&fRetransmitTimer, TCPEndpoint::_RetransmitTimer,
this);
@@ -459,6 +456,8 @@ TCPEndpoint::TCPEndpoint(net_socket* socket)
TCPEndpoint::_DelayedAcknowledgeTimer, this);
gStackModule->init_timer(&fTimeWaitTimer, TCPEndpoint::_TimeWaitTimer,
this);
T(APICall(this, "constructor"));
}
@@ -466,8 +465,11 @@ TCPEndpoint::~TCPEndpoint()
{
mutex_lock(&fLock);
T(APICall(this, "destructor"));
_CancelConnectionTimers();
gStackModule->cancel_timer(&fTimeWaitTimer);
T(TimerSet(this, "time-wait", -1));
if (fManager != NULL) {
fManager->Unbind(this);
@@ -489,12 +491,6 @@ TCPEndpoint::~TCPEndpoint()
status_t
TCPEndpoint::InitCheck() const
{
if (fReceiveList.InitCheck() < B_OK)
return fReceiveList.InitCheck();
if (fSendList.InitCheck() < B_OK)
return fSendList.InitCheck();
return B_OK;
}
@@ -506,6 +502,7 @@ status_t
TCPEndpoint::Open()
{
TRACE("Open()");
T(APICall(this, "open"));
status_t status = ProtocolSocket::Open();
if (status < B_OK)
@@ -522,10 +519,11 @@ TCPEndpoint::Open()
status_t
TCPEndpoint::Close()
{
TRACE("Close()");
MutexLocker locker(fLock);
TRACE("Close()");
T(APICall(this, "close"));
if (fState == LISTEN)
delete_sem(fAcceptSemaphore);
@@ -546,15 +544,15 @@ TCPEndpoint::Close()
bigtime_t maximum = absolute_timeout(socket->linger * 1000000LL);
while (fSendQueue.Used() > 0) {
status = fSendList.Wait(locker, maximum);
status = _WaitForCondition(fSendCondition, locker, maximum);
if (status == B_TIMED_OUT || status == B_WOULD_BLOCK)
break;
else if (status < B_OK)
return status;
}
TRACE("Close(): after waiting, the SendQ was left with %lu bytes.",
fSendQueue.Used());
TRACE("Close(): after waiting, the SendQ was left with %" B_PRIuSIZE
" bytes.", fSendQueue.Used());
}
return B_OK;
}
@@ -563,10 +561,11 @@ TCPEndpoint::Close()
void
TCPEndpoint::Free()
{
TRACE("Free()");
MutexLocker _(fLock);
TRACE("Free()");
T(APICall(this, "free"));
if (fState <= SYNCHRONIZE_SENT)
return;
@@ -587,18 +586,19 @@ TCPEndpoint::Free()
status_t
TCPEndpoint::Connect(const sockaddr* address)
{
TRACE("Connect() on address %s", PrintAddress(address));
if (!AddressModule()->is_same_family(address))
return EAFNOSUPPORT;
MutexLocker locker(fLock);
TRACE("Connect() on address %s", PrintAddress(address));
T(APICall(this, "connect"));
if (gStackModule->is_restarted_syscall()) {
bigtime_t timeout = gStackModule->restore_syscall_restart_timeout();
status_t status = _WaitForEstablished(locker, timeout);
TRACE(" Connect(): Connection complete: %s (timeout was %llu)",
strerror(status), timeout);
TRACE(" Connect(): Connection complete: %s (timeout was %"
B_PRIdBIGTIME ")", strerror(status), timeout);
return posix_error(status);
}
@@ -656,8 +656,8 @@ TCPEndpoint::Connect(const sockaddr* address)
gStackModule->store_syscall_restart_timeout(absoluteTimeout);
status = _WaitForEstablished(locker, absoluteTimeout);
TRACE(" Connect(): Connection complete: %s (timeout was %llu)",
strerror(status), timeout);
TRACE(" Connect(): Connection complete: %s (timeout was %" B_PRIdBIGTIME
")", strerror(status), timeout);
return posix_error(status);
}
@@ -665,10 +665,11 @@ TCPEndpoint::Connect(const sockaddr* address)
status_t
TCPEndpoint::Accept(struct net_socket** _acceptedSocket)
{
TRACE("Accept()");
MutexLocker locker(fLock);
TRACE("Accept()");
T(APICall(this, "accept"));
status_t status;
bigtime_t timeout = absolute_timeout(socket->receive.timeout);
if (gStackModule->is_restarted_syscall())
@@ -709,6 +710,7 @@ TCPEndpoint::Bind(const sockaddr *address)
MutexLocker lock(fLock);
TRACE("Bind() on address %s", PrintAddress(address));
T(APICall(this, "bind"));
if (fState != CLOSED)
return EISCONN;
@@ -720,9 +722,11 @@ TCPEndpoint::Bind(const sockaddr *address)
status_t
TCPEndpoint::Unbind(struct sockaddr *address)
{
TRACE("Unbind()");
MutexLocker _(fLock);
TRACE("Unbind()");
T(APICall(this, "unbind"));
return fManager->Unbind(this);
}
@@ -730,10 +734,11 @@ TCPEndpoint::Unbind(struct sockaddr *address)
status_t
TCPEndpoint::Listen(int count)
{
TRACE("Listen()");
MutexLocker _(fLock);
TRACE("Listen()");
T(APICall(this, "listen"));
if (fState != CLOSED && fState != LISTEN)
return B_BAD_VALUE;
@@ -761,10 +766,11 @@ TCPEndpoint::Listen(int count)
status_t
TCPEndpoint::Shutdown(int direction)
{
TRACE("Shutdown(%i)", direction);
MutexLocker lock(fLock);
TRACE("Shutdown(%i)", direction);
T(APICall(this, "shutdown"));
if (direction == SHUT_RD || direction == SHUT_RDWR)
fFlags |= FLAG_NO_RECEIVE;
@@ -784,9 +790,10 @@ TCPEndpoint::SendData(net_buffer *buffer)
{
MutexLocker lock(fLock);
TRACE("SendData(buffer %p, size %lu, flags %lx) [total %lu bytes, has %lu]",
buffer, buffer->size, buffer->flags, fSendQueue.Size(),
fSendQueue.Free());
TRACE("SendData(buffer %p, size %" B_PRIu32 ", flags %#" B_PRIx32
") [total %" B_PRIuSIZE " bytes, has %" B_PRIuSIZE "]", buffer,
buffer->size, buffer->flags, fSendQueue.Size(), fSendQueue.Free());
T(APICall(this, "senddata"));
uint32 flags = buffer->flags;
@@ -812,7 +819,7 @@ TCPEndpoint::SendData(net_buffer *buffer)
while (left > 0) {
while (fSendQueue.Free() < socket->send.low_water_mark) {
// wait until enough space is available
status_t status = fSendList.Wait(lock, timeout);
status_t status = _WaitForCondition(fSendCondition, lock, timeout);
if (status < B_OK) {
TRACE(" SendData() returning %s (%d)",
strerror(posix_error(status)), (int)posix_error(status));
@@ -851,7 +858,7 @@ TCPEndpoint::SendData(net_buffer *buffer)
}
}
TRACE(" SendData(): %lu bytes used.", fSendQueue.Used());
TRACE(" SendData(): %" B_PRIuSIZE " bytes used.", fSendQueue.Used());
bool force = false;
if ((flags & MSG_OOB) != 0) {
@@ -885,7 +892,8 @@ TCPEndpoint::SendAvailable()
else
available = EPIPE;
TRACE("SendAvailable(): %li", available);
TRACE("SendAvailable(): %" B_PRIdSSIZE, available);
T(APICall(this, "sendavailable"));
return available;
}
@@ -906,10 +914,12 @@ TCPEndpoint::FillStat(net_stat *stat)
status_t
TCPEndpoint::ReadData(size_t numBytes, uint32 flags, net_buffer** _buffer)
{
TRACE("ReadData(%lu bytes, flags 0x%x)", numBytes, (unsigned int)flags);
MutexLocker locker(fLock);
TRACE("ReadData(%" B_PRIuSIZE " bytes, flags %#" B_PRIx32 ")", numBytes,
flags);
T(APICall(this, "readdata"));
*_buffer = NULL;
if (fState == CLOSED)
@@ -963,7 +973,7 @@ TCPEndpoint::ReadData(size_t numBytes, uint32 flags, net_buffer** _buffer)
if ((fFlags & FLAG_NO_RECEIVE) != 0)
return B_OK;
status_t status = fReceiveList.Wait(locker, timeout);
status_t status = _WaitForCondition(fReceiveCondition, locker, timeout);
if (status < B_OK) {
// The Open Group base specification mentions that EINTR should be
// returned if the recv() is interrupted before _any data_ is
@@ -977,16 +987,18 @@ TCPEndpoint::ReadData(size_t numBytes, uint32 flags, net_buffer** _buffer)
}
}
TRACE(" ReadData(): %lu are available.", fReceiveQueue.Available());
TRACE(" ReadData(): %" B_PRIuSIZE " are available.",
fReceiveQueue.Available());
if (numBytes < fReceiveQueue.Available())
fReceiveList.Signal();
fReceiveCondition.NotifyAll();
bool clone = (flags & MSG_PEEK) != 0;
ssize_t receivedBytes = fReceiveQueue.Get(numBytes, !clone, _buffer);
TRACE(" ReadData(): %lu bytes kept.", fReceiveQueue.Available());
TRACE(" ReadData(): %" B_PRIuSIZE " bytes kept.",
fReceiveQueue.Available());
// if we are opening the window, check if we should send an ACK
if (!clone)
@@ -1001,7 +1013,8 @@ TCPEndpoint::ReadAvailable()
{
MutexLocker locker(fLock);
TRACE("ReadAvailable(): %li", _AvailableData());
TRACE("ReadAvailable(): %" B_PRIdSSIZE, _AvailableData());
T(APICall(this, "readavailable"));
return _AvailableData();
}
@@ -1095,11 +1108,13 @@ TCPEndpoint::DelayedAcknowledge()
if (gStackModule->cancel_timer(&fDelayedAcknowledgeTimer)) {
// timer was active, send an ACK now (with the exception above,
// we send every other ACK)
T(TimerSet(this, "delayed ack", -1));
return SendAcknowledge(true);
}
gStackModule->set_timer(&fDelayedAcknowledgeTimer,
TCP_DELAYED_ACKNOWLEDGE_TIMEOUT);
T(TimerSet(this, "delayed ack", TCP_DELAYED_ACKNOWLEDGE_TIMEOUT));
return B_OK;
}
@@ -1114,21 +1129,24 @@ TCPEndpoint::SendAcknowledge(bool force)
void
TCPEndpoint::_StartPersistTimer()
{
gStackModule->set_timer(&fPersistTimer, 1000000LL);
gStackModule->set_timer(&fPersistTimer, TCP_PERSIST_TIMEOUT);
T(TimerSet(this, "persist", TCP_PERSIST_TIMEOUT));
}
void
TCPEndpoint::_EnterTimeWait()
{
TRACE("_EnterTimeWait()\n");
TRACE("_EnterTimeWait()");
_CancelConnectionTimers();
if (fState == TIME_WAIT) {
_CancelConnectionTimers();
if (fState == TIME_WAIT && IsLocal()) {
// we do not use TIME_WAIT state for local connections
fFlags |= FLAG_DELETE_ON_CLOSE;
return;
if (IsLocal()) {
// we do not use TIME_WAIT state for local connections
fFlags |= FLAG_DELETE_ON_CLOSE;
return;
}
}
_UpdateTimeWait();
@@ -1139,6 +1157,7 @@ void
TCPEndpoint::_UpdateTimeWait()
{
gStackModule->set_timer(&fTimeWaitTimer, TCP_MAX_SEGMENT_LIFETIME << 1);
T(TimerSet(this, "time-wait", TCP_MAX_SEGMENT_LIFETIME << 1));
}
@@ -1146,8 +1165,11 @@ void
TCPEndpoint::_CancelConnectionTimers()
{
gStackModule->cancel_timer(&fRetransmitTimer);
T(TimerSet(this, "retransmit", -1));
gStackModule->cancel_timer(&fPersistTimer);
T(TimerSet(this, "persist", -1));
gStackModule->cancel_timer(&fDelayedAcknowledgeTimer);
T(TimerSet(this, "delayed ack", -1));
}
@@ -1190,7 +1212,7 @@ TCPEndpoint::_MarkEstablished()
release_sem_etc(fAcceptSemaphore, 1, B_DO_NOT_RESCHEDULE);
}
fSendList.Signal();
fSendCondition.NotifyAll();
gSocketModule->notify(socket, B_SELECT_WRITE, fSendQueue.Free());
}
@@ -1204,7 +1226,7 @@ TCPEndpoint::_WaitForEstablished(MutexLocker &locker, bigtime_t timeout)
if (socket->error != B_OK)
return socket->error;
status_t status = fSendList.Wait(locker, timeout);
status_t status = _WaitForCondition(fSendCondition, locker, timeout);
if (status < B_OK)
return status;
}
@@ -1225,7 +1247,7 @@ TCPEndpoint::_Close()
fFlags |= FLAG_DELETE_ON_CLOSE;
fSendList.Signal();
fSendCondition.NotifyAll();
_NotifyReader();
if (gSocketModule->has_parent(socket)) {
@@ -1256,8 +1278,7 @@ TCPEndpoint::_DuplicateAcknowledge(tcp_segment_header &segment)
if (fDuplicateAcknowledgeCount == 3) {
_ResetSlowStart();
fCongestionWindow = fSlowStartThreshold + 3
* fSendMaxSegmentSize;
fCongestionWindow = fSlowStartThreshold + 3 * fSendMaxSegmentSize;
fSendNext = segment.acknowledge;
} else if (fDuplicateAcknowledgeCount > 3)
fCongestionWindow += fSendMaxSegmentSize;
@@ -1303,7 +1324,7 @@ TCPEndpoint::_AvailableData() const
void
TCPEndpoint::_NotifyReader()
{
fReceiveList.Signal();
fReceiveCondition.NotifyAll();
gSocketModule->notify(socket, B_SELECT_READ, _AvailableData());
}
@@ -1328,8 +1349,8 @@ TCPEndpoint::_AddData(tcp_segment_header& segment, net_buffer* buffer)
segment.flags |= TCP_FLAG_FINISH;
}
TRACE(" _AddData(): adding data, receive next = %lu. Now have %lu bytes.",
fReceiveNext.Number(), fReceiveQueue.Available());
TRACE(" _AddData(): adding data, receive next = %" B_PRIu32 ". Now have %"
B_PRIuSIZE " bytes.", fReceiveNext.Number(), fReceiveQueue.Available());
if ((segment.flags & TCP_FLAG_PUSH) != 0)
fReceiveQueue.SetPushPointer();
@@ -1543,8 +1564,8 @@ TCPEndpoint::_Receive(tcp_segment_header& segment, net_buffer* buffer)
// Check sequence number
if (!segment_in_sequence(segment, segmentLength, fReceiveNext,
fReceiveWindow)) {
TRACE(" Receive(): segment out of window, next: %lu wnd: %lu",
fReceiveNext.Number(), fReceiveWindow);
TRACE(" Receive(): segment out of window, next: %" B_PRIu32
" wnd: %" B_PRIu32, fReceiveNext.Number(), fReceiveWindow);
if ((segment.flags & TCP_FLAG_RESET) != 0) {
// TODO: this doesn't look right - review!
return DROP;
@@ -1602,7 +1623,7 @@ TCPEndpoint::_Receive(tcp_segment_header& segment, net_buffer* buffer)
}
// remove duplicate data at the start
TRACE("* remove %ld bytes from the start", drop);
TRACE("* remove %" B_PRId32 " bytes from the start", drop);
gBufferModule->remove_header(buffer, drop);
segment.sequence += drop;
}
@@ -1628,14 +1649,14 @@ TCPEndpoint::_Receive(tcp_segment_header& segment, net_buffer* buffer)
}
segment.flags &= ~(TCP_FLAG_FINISH | TCP_FLAG_PUSH);
TRACE("* remove %ld bytes from the end", drop);
TRACE("* remove %" B_PRId32 " bytes from the end", drop);
gBufferModule->remove_trailer(buffer, drop);
}
#ifdef TRACE_TCP
if (advertisedWindow > fSendWindow) {
TRACE(" Receive(): Window update %lu -> %lu", fSendWindow,
advertisedWindow);
TRACE(" Receive(): Window update %" B_PRIu32 " -> %" B_PRIu32,
fSendWindow, advertisedWindow);
}
#endif
@@ -1777,7 +1798,7 @@ TCPEndpoint::_Receive(tcp_segment_header& segment, net_buffer* buffer)
_UpdateTimestamps(segment, segmentLength);
TRACE("Receive() Action %ld", action);
TRACE("Receive() Action %" B_PRId32, action);
return action;
}
@@ -1788,9 +1809,9 @@ TCPEndpoint::SegmentReceived(tcp_segment_header& segment, net_buffer* buffer)
{
MutexLocker locker(fLock);
TRACE("SegmentReceived(): buffer %p (%lu bytes) address %s to %s\n"
"\tflags 0x%x, seq %lu, ack %lu, wnd %lu",
buffer, buffer->size, PrintAddress(buffer->source),
TRACE("SegmentReceived(): buffer %p (%" B_PRIu32 " bytes) address %s "
"to %s flags %#" B_PRIx8 ", seq %" B_PRIu32 ", ack %" B_PRIu32
", wnd %" B_PRIu32, buffer, buffer->size, PrintAddress(buffer->source),
PrintAddress(buffer->destination), segment.flags, segment.sequence,
segment.acknowledge,
(uint32)segment.advertised_window << fSendWindowShift);
@@ -2006,7 +2027,8 @@ TCPEndpoint::_SendQueued(bool force, uint32 sendWindow)
}
uint32 length = min_c(fSendQueue.Available(fSendNext), sendWindow);
tcp_sequence previousSendNext = fSendNext;
bool shouldStartRetransmitTimer = fSendNext == fSendUnacknowledged;
bool retransmit = fSendNext < fSendMax;
do {
uint32 segmentMaxSize = fSendMaxSegmentSize
@@ -2021,7 +2043,7 @@ TCPEndpoint::_SendQueued(bool force, uint32 sendWindow)
}
// Determine if we should really send this segment
if (!force && !_ShouldSendSegment(segment, segmentLength,
if (!force && !retransmit && !_ShouldSendSegment(segment, segmentLength,
segmentMaxSize, flightSize)) {
if (fSendQueue.Available()
&& !gStackModule->is_timer_active(&fPersistTimer)
@@ -2048,9 +2070,10 @@ TCPEndpoint::_SendQueued(bool force, uint32 sendWindow)
uint32 size = buffer->size;
segment.sequence = fSendNext.Number();
TRACE("SendQueued(): buffer %p (%lu bytes) address %s to %s\n"
"\tflags 0x%x, seq %lu, ack %lu, rwnd %hu, cwnd %lu, ssthresh %lu\n"
"\tlen %lu first %lu last %lu",
TRACE("SendQueued(): buffer %p (%" B_PRIu32 " bytes) address %s to "
"%s flags %#" B_PRIx8 ", seq %" B_PRIu32 ", ack %" B_PRIu32
", rwnd %" B_PRIu16 ", cwnd %" B_PRIu32 ", ssthresh %" B_PRIu32
", len %" B_PRIu32 ", first %" B_PRIu32 ", last %" B_PRIu32,
buffer, buffer->size, PrintAddress(buffer->source),
PrintAddress(buffer->destination), segment.flags, segment.sequence,
segment.acknowledge, segment.advertised_window,
@@ -2099,24 +2122,26 @@ TCPEndpoint::_SendQueued(bool force, uint32 sendWindow)
return status;
}
if (shouldStartRetransmitTimer && size > 0) {
TRACE("starting initial retransmit timer of: %" B_PRIdBIGTIME,
fRetransmitTimeout);
gStackModule->set_timer(&fRetransmitTimer, fRetransmitTimeout);
T(TimerSet(this, "retransmit", fRetransmitTimeout));
shouldStartRetransmitTimer = false;
}
if (segment.flags & TCP_FLAG_ACKNOWLEDGE)
fLastAcknowledgeSent = segment.acknowledge;
length -= segmentLength;
segment.flags &= ~(TCP_FLAG_SYNCHRONIZE | TCP_FLAG_RESET
| TCP_FLAG_FINISH);
if (retransmit)
break;
} while (length > 0);
// if we sent data from the beggining of the send queue,
// start the retransmition timer
if (previousSendNext == fSendUnacknowledged
&& fSendNext > previousSendNext) {
TRACE(" SendQueue(): set retransmit timer with rto %llu",
fRetransmitTimeout);
gStackModule->set_timer(&fRetransmitTimer, fRetransmitTimeout);
}
return B_OK;
}
@@ -2172,29 +2197,41 @@ TCPEndpoint::_PrepareSendPath(const sockaddr* peer)
void
TCPEndpoint::_Acknowledged(tcp_segment_header& segment)
{
size_t previouslyUsed = fSendQueue.Used();
TRACE("_Acknowledged(): ack %" B_PRIu32 "; uack %" B_PRIu32 "; next %"
B_PRIu32 "; max %" B_PRIu32, segment.acknowledge,
fSendUnacknowledged.Number(), fSendNext.Number(), fSendMax.Number());
fSendQueue.RemoveUntil(segment.acknowledge);
fSendUnacknowledged = segment.acknowledge;
ASSERT(fSendUnacknowledged <= segment.acknowledge);
if (fSendNext < fSendUnacknowledged)
fSendNext = fSendUnacknowledged;
if (fSendUnacknowledged == fSendMax)
gStackModule->cancel_timer(&fRetransmitTimer);
if (fSendQueue.Used() < previouslyUsed) {
// this ACK acknowledged data
if (fSendUnacknowledged < segment.acknowledge) {
fSendQueue.RemoveUntil(segment.acknowledge);
fSendUnacknowledged = segment.acknowledge;
if (fSendNext < fSendUnacknowledged)
fSendNext = fSendUnacknowledged;
if (segment.options & TCP_HAS_TIMESTAMPS)
_UpdateRoundTripTime(tcp_diff_timestamp(segment.timestamp_reply));
else {
// TODO: Fallback to RFC 793 type estimation
// TODO: Fallback to RFC 793 type estimation; This just resets
// any potential exponential back off that happened due to
// retransmits.
fRetransmitTimeout = TCP_INITIAL_RTT;
}
if (fSendUnacknowledged == fSendMax) {
TRACE("all acknowledged, cancelling retransmission timer");
gStackModule->cancel_timer(&fRetransmitTimer);
T(TimerSet(this, "retransmit", -1));
} else {
TRACE("data acknowledged, resetting retransmission timer to: %"
B_PRIdBIGTIME, fRetransmitTimeout);
gStackModule->set_timer(&fRetransmitTimer, fRetransmitTimeout);
T(TimerSet(this, "retransmit", fRetransmitTimeout));
}
if (is_writable(fState)) {
// notify threads waiting on the socket to become writable again
fSendList.Signal();
fSendCondition.NotifyAll();
gSocketModule->notify(socket, B_SELECT_WRITE, fSendQueue.Free());
}
@@ -2213,7 +2250,7 @@ TCPEndpoint::_Acknowledged(tcp_segment_header& segment)
fCongestionWindow += increment;
}
// if there is data left to be send, send it now
// if there is data left to be sent, send it now
if (fSendQueue.Used() > 0)
_SendQueued();
}
@@ -2223,8 +2260,15 @@ void
TCPEndpoint::_Retransmit()
{
TRACE("Retransmit()");
_ResetSlowStart();
fSendNext = fSendUnacknowledged;
// Do exponential back off of the retransmit timeout
fRetransmitTimeout *= 2;
if (fRetransmitTimeout > TCP_MAX_RETRANSMIT_TIMEOUT)
fRetransmitTimeout = TCP_MAX_RETRANSMIT_TIMEOUT;
_SendQueued();
}
@@ -2244,9 +2288,11 @@ TCPEndpoint::_UpdateRoundTripTime(int32 roundTripTime)
fRetransmitTimeout = ((fRoundTripTime / 4 + fRoundTripDeviation) / 2)
* kTimestampFactor;
if (fRetransmitTimeout < TCP_MIN_RETRANSMIT_TIMEOUT)
fRetransmitTimeout = TCP_MIN_RETRANSMIT_TIMEOUT;
TRACE(" RTO is now %llu (after rtt %ldms)", fRetransmitTimeout,
roundTripTime);
TRACE(" RTO is now %" B_PRIdBIGTIME " (after rtt %" B_PRId32 "ms)",
fRetransmitTimeout, roundTripTime);
}
@@ -2266,7 +2312,7 @@ TCPEndpoint::_ResetSlowStart()
TCPEndpoint::_RetransmitTimer(net_timer* timer, void* _endpoint)
{
TCPEndpoint* endpoint = (TCPEndpoint*)_endpoint;
T(Timer(endpoint, "retransmit"));
T(TimerTriggered(endpoint, "retransmit"));
MutexLocker locker(endpoint->fLock);
if (!locker.IsLocked())
@@ -2280,7 +2326,7 @@ TCPEndpoint::_RetransmitTimer(net_timer* timer, void* _endpoint)
TCPEndpoint::_PersistTimer(net_timer* timer, void* _endpoint)
{
TCPEndpoint* endpoint = (TCPEndpoint*)_endpoint;
T(Timer(endpoint, "persist"));
T(TimerTriggered(endpoint, "persist"));
MutexLocker locker(endpoint->fLock);
if (!locker.IsLocked())
@@ -2298,7 +2344,7 @@ TCPEndpoint::_PersistTimer(net_timer* timer, void* _endpoint)
TCPEndpoint::_DelayedAcknowledgeTimer(net_timer* timer, void* _endpoint)
{
TCPEndpoint* endpoint = (TCPEndpoint*)_endpoint;
T(Timer(endpoint, "delayed ack"));
T(TimerTriggered(endpoint, "delayed ack"));
MutexLocker locker(endpoint->fLock);
if (!locker.IsLocked())
@@ -2316,7 +2362,7 @@ TCPEndpoint::_DelayedAcknowledgeTimer(net_timer* timer, void* _endpoint)
TCPEndpoint::_TimeWaitTimer(net_timer* timer, void* _endpoint)
{
TCPEndpoint* endpoint = (TCPEndpoint*)_endpoint;
T(Timer(endpoint, "time-wait"));
T(TimerTriggered(endpoint, "time-wait"));
MutexLocker locker(endpoint->fLock);
if (!locker.IsLocked())
@@ -2333,6 +2379,21 @@ TCPEndpoint::_TimeWaitTimer(net_timer* timer, void* _endpoint)
}
/*static*/ status_t
TCPEndpoint::_WaitForCondition(ConditionVariable& condition,
MutexLocker& locker, bigtime_t timeout)
{
ConditionVariableEntry entry;
condition.Add(&entry);
locker.Unlock();
status_t result = entry.Wait(B_ABSOLUTE_TIMEOUT | B_CAN_INTERRUPT, timeout);
locker.Lock();
return result;
}
// #pragma mark -
@@ -2348,7 +2409,7 @@ TCPEndpoint::Dump() const
kprintf(" accept sem: %" B_PRId32 "\n", fAcceptSemaphore);
kprintf(" options: 0x%" B_PRIx32 "\n", (uint32)fOptions);
kprintf(" send\n");
kprintf(" window shift: %u\n", fSendWindowShift);
kprintf(" window shift: %" B_PRIu8 "\n", fSendWindowShift);
kprintf(" unacknowledged: %" B_PRIu32 "\n",
fSendUnacknowledged.Number());
kprintf(" next: %" B_PRIu32 "\n", fSendNext.Number());
@@ -2357,7 +2418,8 @@ TCPEndpoint::Dump() const
kprintf(" window: %" B_PRIu32 "\n", fSendWindow);
kprintf(" max window: %" B_PRIu32 "\n", fSendMaxWindow);
kprintf(" max segment size: %" B_PRIu32 "\n", fSendMaxSegmentSize);
kprintf(" queue: %lu / %lu\n", fSendQueue.Used(), fSendQueue.Size());
kprintf(" queue: %" B_PRIuSIZE " / %" B_PRIuSIZE "\n", fSendQueue.Used(),
fSendQueue.Size());
#if DEBUG_BUFFER_QUEUE
fSendQueue.Dump();
#endif
@@ -2366,14 +2428,14 @@ TCPEndpoint::Dump() const
kprintf(" initial sequence: %" B_PRIu32 "\n",
fInitialSendSequence.Number());
kprintf(" receive\n");
kprintf(" window shift: %u\n", fReceiveWindowShift);
kprintf(" window shift: %" B_PRIu8 "\n", fReceiveWindowShift);
kprintf(" next: %" B_PRIu32 "\n", fReceiveNext.Number());
kprintf(" max advertised: %" B_PRIu32 "\n",
fReceiveMaxAdvertised.Number());
kprintf(" window: %" B_PRIu32 "\n", fReceiveWindow);
kprintf(" max segment size: %" B_PRIu32 "\n", fReceiveMaxSegmentSize);
kprintf(" queue: %lu / %lu\n", fReceiveQueue.Available(),
fReceiveQueue.Size());
kprintf(" queue: %" B_PRIuSIZE " / %" B_PRIuSIZE "\n",
fReceiveQueue.Available(), fReceiveQueue.Size());
#if DEBUG_BUFFER_QUEUE
fReceiveQueue.Dump();
#endif
src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.h
+8 -19
View File
@@ -25,22 +25,6 @@
#include <stddef.h>
class WaitList {
public:
WaitList(const char* name);
~WaitList();
status_t InitCheck() const;
status_t Wait(MutexLocker& locker, bigtime_t timeout = B_INFINITE_TIMEOUT);
void Signal();
private:
int32 fCondition;
sem_id fSem;
};
class TCPEndpoint : public net_protocol, public ProtocolSocket {
public:
TCPEndpoint(net_socket* socket);
@@ -132,6 +116,9 @@ private:
static void _DelayedAcknowledgeTimer(net_timer* timer,
void* _endpoint);
static status_t _WaitForCondition(ConditionVariable& condition,
MutexLocker& locker, bigtime_t timeout);
private:
TCPEndpoint* fConnectionHashLink;
TCPEndpoint* fEndpointHashLink;
@@ -141,8 +128,10 @@ private:
mutex fLock;
EndpointManager* fManager;
WaitList fReceiveList;
WaitList fSendList;
ConditionVariable
fReceiveCondition;
ConditionVariable
fSendCondition;
sem_id fAcceptSemaphore;
uint8 fOptions;
@@ -161,7 +150,7 @@ private:
tcp_sequence fInitialSendSequence;
uint32 fDuplicateAcknowledgeCount;
net_route *fRoute;
net_route *fRoute;
// TODO: don't use a net_route, but a net_route_info!!!
// (the latter will automatically adapt to routing changes)
src/add-ons/kernel/network/protocols/tcp/tcp.h
+26 -18
View File
@@ -43,30 +43,30 @@ enum tcp_state {
};
struct tcp_header {
uint16 source_port;
uint16 destination_port;
uint32 sequence;
uint32 acknowledge;
uint16 source_port;
uint16 destination_port;
uint32 sequence;
uint32 acknowledge;
struct {
#if B_HOST_IS_LENDIAN == 1
uint8 reserved : 4;
uint8 header_length : 4;
uint8 reserved : 4;
uint8 header_length : 4;
#else
uint8 header_length : 4;
uint8 reserved : 4;
uint8 header_length : 4;
uint8 reserved : 4;
#endif
};
uint8 flags;
uint16 advertised_window;
uint16 checksum;
uint16 urgent_offset;
uint8 flags;
uint16 advertised_window;
uint16 checksum;
uint16 urgent_offset;
uint32 HeaderLength() const { return (uint32)header_length << 2; }
uint32 Sequence() const { return ntohl(sequence); }
uint32 Acknowledge() const { return ntohl(acknowledge); }
uint16 AdvertisedWindow() const { return ntohs(advertised_window); }
uint16 Checksum() const { return ntohs(checksum); }
uint16 UrgentOffset() const { return ntohs(urgent_offset); }
uint32 HeaderLength() const { return (uint32)header_length << 2; }
uint32 Sequence() const { return ntohl(sequence); }
uint32 Acknowledge() const { return ntohl(acknowledge); }
uint16 AdvertisedWindow() const { return ntohs(advertised_window); }
uint16 Checksum() const { return ntohs(checksum); }
uint16 UrgentOffset() const { return ntohs(urgent_offset); }
} _PACKED;
class tcp_sequence {
@@ -185,6 +185,14 @@ operator==(tcp_sequence a, tcp_sequence b)
#define TCP_DEFAULT_MAX_SEGMENT_SIZE 536
#define TCP_MAX_WINDOW 65535
#define TCP_MAX_SEGMENT_LIFETIME 60000000 // 60 secs
#define TCP_PERSIST_TIMEOUT 1000000 // 1 sec
// Initial estimate for packet round trip time (RTT)
#define TCP_INITIAL_RTT 2000000 // 2 secs
// Minimum retransmit timeout (consider delayed ack)
#define TCP_MIN_RETRANSMIT_TIMEOUT 200000 // 200 msecs
// Maximum retransmit timeout (per RFC6298)
#define TCP_MAX_RETRANSMIT_TIMEOUT 60000000 // 60 secs
struct tcp_sack {
uint32 left_edge;
src/add-ons/kernel/partitioning_systems/gpt/Header.cpp
+9 -9
View File
@@ -290,24 +290,24 @@ Header::_Read(int fd, off_t offset, void* data, size_t size) const
bool
Header::_IsHeaderValid(const efi_table_header& header, uint64 block)
Header::_IsHeaderValid(efi_table_header& header, uint64 block)
{
return !memcmp(fHeader.header, EFI_PARTITION_HEADER, sizeof(fHeader.header))
&& _ValidateHeaderCRC()
&& fHeader.AbsoluteBlock() == block;
return !memcmp(header.header, EFI_PARTITION_HEADER, sizeof(header.header))
&& _ValidateHeaderCRC(header)
&& header.AbsoluteBlock() == block;
}
bool
Header::_ValidateHeaderCRC()
Header::_ValidateHeaderCRC(efi_table_header& header)
{
uint32 originalCRC = fHeader.HeaderCRC();
fHeader.SetHeaderCRC(0);
uint32 originalCRC = header.HeaderCRC();
header.SetHeaderCRC(0);
bool matches = originalCRC == crc32((const uint8*)&fHeader,
bool matches = originalCRC == crc32((const uint8*)&header,
sizeof(efi_table_header));
fHeader.SetHeaderCRC(originalCRC);
header.SetHeaderCRC(originalCRC);
return matches;
}
src/add-ons/kernel/partitioning_systems/gpt/Header.h
+2 -2
View File
@@ -53,9 +53,9 @@ private:
status_t _Read(int fd, off_t offset, void* data,
size_t size) const;
bool _IsHeaderValid(const efi_table_header& header,
static bool _IsHeaderValid(efi_table_header& header,
uint64 block);
bool _ValidateHeaderCRC();
static bool _ValidateHeaderCRC(efi_table_header& header);
bool _ValidateEntriesCRC() const;
void _SetBackupHeaderFromPrimary(uint64 lastBlock);
size_t _EntryArraySize() const
src/add-ons/mail_daemon/outbound_protocols/smtp/SMTP.cpp
+10 -10
View File
@@ -450,9 +450,9 @@ SMTPProtocol::Open(const char *address, int port, bool esmtp)
char *cmd = new char[::strlen(localhost)+8];
if (!esmtp)
::sprintf(cmd,"HELO %s"CRLF, localhost);
::sprintf(cmd,"HELO %s" CRLF, localhost);
else
::sprintf(cmd,"EHLO %s"CRLF, localhost);
::sprintf(cmd,"EHLO %s" CRLF, localhost);
if (SendCommand(cmd) != B_OK) {
delete[] cmd;
@@ -467,7 +467,7 @@ SMTPProtocol::Open(const char *address, int port, bool esmtp)
SSL_library_init();
RAND_seed(this,sizeof(SMTPProtocol));
::sprintf(cmd, "STARTTLS"CRLF);
::sprintf(cmd, "STARTTLS" CRLF);
if ((p = ::strstr(res, "STARTTLS")) != NULL) {
// Server advertises STARTTLS support
@@ -489,9 +489,9 @@ SMTPProtocol::Open(const char *address, int port, bool esmtp)
// Should send EHLO command again
if(!esmtp)
::sprintf(cmd, "HELO %s"CRLF, localhost);
::sprintf(cmd, "HELO %s" CRLF, localhost);
else
::sprintf(cmd, "EHLO %s"CRLF, localhost);
::sprintf(cmd, "EHLO %s" CRLF, localhost);
if (SendCommand(cmd) != B_OK) {
delete[] cmd;
@@ -604,7 +604,7 @@ SMTPProtocol::Login(const char *_login, const char *password)
// required for authentication to SMTP-servers. Integrity-
// and confidentiality-protection are not implemented, as
// they are provided by the use of OpenSSL.
SendCommand("AUTH DIGEST-MD5"CRLF);
SendCommand("AUTH DIGEST-MD5" CRLF);
const char *res = fLog.String();
if (strncmp(res, "334", 3) != 0)
@@ -677,7 +677,7 @@ SMTPProtocol::Login(const char *_login, const char *password)
}
if (fAuthType & CRAM_MD5) {
//******* CRAM-MD5 Authentication ( tested. works fine [with Cyrus SASL] )
SendCommand("AUTH CRAM-MD5"CRLF);
SendCommand("AUTH CRAM-MD5" CRLF);
const char *res = fLog.String();
if (strncmp(res, "334", 3) != 0)
@@ -715,7 +715,7 @@ SMTPProtocol::Login(const char *_login, const char *password)
//******* LOGIN Authentication ( tested. works fine)
ssize_t encodedsize; // required by our base64 implementation
SendCommand("AUTH LOGIN"CRLF);
SendCommand("AUTH LOGIN" CRLF);
const char *res = fLog.String();
if (strncmp(res, "334", 3) != 0)
@@ -938,9 +938,9 @@ SMTPProtocol::Send(const char* to, const char* from, BPositionIO *message)
delete [] data;
if (messageEndedWithCRLF)
cmd = "."CRLF; // The standard says don't add extra CRLF.
cmd = "." CRLF; // The standard says don't add extra CRLF.
else
cmd = CRLF"."CRLF;
cmd = CRLF "." CRLF;
if (SendCommand(cmd.String()) != B_OK)
return B_ERROR;
src/add-ons/media/plugins/ffmpeg/COPYING.GPL
-339
View File
@@ -1,339 +0,0 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
src/add-ons/media/plugins/ffmpeg/COPYING.LGPL
-504
View File
@@ -1,504 +0,0 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).
To apply these terms, attach the following notices to the library. It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!
src/add-ons/media/plugins/ffmpeg/README.md
-17
View File
@@ -1,17 +0,0 @@
This file collects knowledge about the FFMPEG-library used by the FFMPEG plugin.
As it turns out documentation on how to use the FFMPEG-libraries (libavcodec, libavformat, ...) to decode audio and video data is rather thinly spread.
There are three main resources that can be recommended for understanding how to use the FFMPEG-libraries:
1. Example source code provided by the FFMPEG project.
- It is part of the FFMPEG source code and is located in /path/to/ffmpeg/source/doc/examples
- Studying the example "decoding_encoding.c" is especially interesting, as it provides examples on how to decode and encode audio / video files with FFMPEG.
2. An ffmpeg and SDL Tutorial: http://dranger.com/ffmpeg/tutorial01.html
- This tutorial contains several parts, whereby parts 5 to 8 are the most relevant parts, as they provide a lot of advanced knowledge about the usage and inner workings of FFMPEGs APIs.
3. The source code of the Chromium project: http://src.chromium.org/viewvc/chrome/trunk/src/
- Chromium is the basis for Google's Chrome web browser and uses FFMPEG libraries to implement HTML-5 audio and video playback. Chromium's source code is well documented and in wide use. This gives a good real life reference on how to use the FFMPEG-API's and some of its gotchas.
- For video decoding a good starting point is the file media/filters/ffmpeg_video_decoder.cc and within it the method FFmpegVideoDecoder::FFmpegDecode().
- For audio decoding a good starting point is the file media/filters/ffmpeg_audio_decoder.cc and within it the method FFmpegAudioDecoder::FFmpegDecode().
src/apps/debugger/MessageCodes.h
+1
View File
@@ -31,6 +31,7 @@ enum {
MSG_SET_CUSTOM_SIGNAL_DISPOSITION = 'scsd',
MSG_REMOVE_CUSTOM_SIGNAL_DISPOSITION = 'rcsd',
MSG_TEAM_RENAMED = 'tera',
MSG_THREAD_STATE_CHANGED = 'tsch',
MSG_THREAD_CPU_STATE_CHANGED = 'tcsc',
MSG_THREAD_STACK_TRACE_CHANGED = 'tstc',
src/apps/debugger/controllers/TeamDebugger.cpp
+74 -9
View File
@@ -231,7 +231,8 @@ TeamDebugger::TeamDebugger(Listener* listener, UserInterface* userInterface,
fTerminating(false),
fKillTeamOnQuit(false),
fCommandLineArgc(0),
fCommandLineArgv(NULL)
fCommandLineArgv(NULL),
fExecPending(false)
{
fUserInterface->AcquireReference();
}
@@ -454,7 +455,8 @@ TeamDebugger::Init(team_id teamID, thread_id threadID, int argc,
// set team debugging flags
fDebuggerInterface->SetTeamDebuggingFlags(
B_TEAM_DEBUG_THREADS | B_TEAM_DEBUG_IMAGES
| B_TEAM_DEBUG_POST_SYSCALL | B_TEAM_DEBUG_SIGNALS);
| B_TEAM_DEBUG_POST_SYSCALL | B_TEAM_DEBUG_SIGNALS
| B_TEAM_DEBUG_TEAM_CREATION);
// get the initial state of the team
AutoLocker< ::Team> teamLocker(fTeam);
@@ -1556,10 +1558,15 @@ TeamDebugger::_HandleDebuggerMessage(DebugEvent* event)
break;
}
case B_DEBUGGER_MESSAGE_TEAM_EXEC:
{
TRACE_EVENTS("B_DEBUGGER_MESSAGE_TEAM_EXEC: team: %" B_PRId32 "\n",
event->Team());
// TODO: Handle!
TeamExecEvent* teamEvent
= dynamic_cast<TeamExecEvent*>(event);
_PrepareForTeamExec(teamEvent);
break;
}
case B_DEBUGGER_MESSAGE_THREAD_CREATED:
{
ThreadCreatedEvent* threadEvent
@@ -1849,6 +1856,43 @@ TeamDebugger::_HandlePostSyscall(PostSyscallEvent* event)
}
void
TeamDebugger::_PrepareForTeamExec(TeamExecEvent* event)
{
// NB: must be called with team lock held.
_SaveSettings();
// when notified of exec, we need to clear out data related
// to the old team.
const ImageList& images = fTeam->Images();
for (ImageList::ConstIterator it = images.GetIterator();
Image* image = it.Next();) {
fBreakpointManager->RemoveImageBreakpoints(image);
}
BObjectList<UserBreakpoint> breakpointsToRemove(20, false);
const UserBreakpointList& breakpoints = fTeam->UserBreakpoints();
for (UserBreakpointList::ConstIterator it = breakpoints.GetIterator();
UserBreakpoint* breakpoint = it.Next();) {
breakpointsToRemove.AddItem(breakpoint);
breakpoint->AcquireReference();
}
for (int32 i = 0; i < breakpointsToRemove.CountItems(); i++) {
UserBreakpoint* breakpoint = breakpointsToRemove.ItemAt(i);
fTeam->RemoveUserBreakpoint(breakpoint);
fTeam->NotifyUserBreakpointChanged(breakpoint);
breakpoint->ReleaseReference();
}
fTeam->ClearImages();
fTeam->ClearSignalDispositionMappings();
fExecPending = true;
}
void
TeamDebugger::_HandleImageDebugInfoChanged(image_id imageID)
{
@@ -1860,10 +1904,22 @@ TeamDebugger::_HandleImageDebugInfoChanged(image_id imageID)
Image* image = imageHandler->GetImage();
BReference<Image> imageReference(image);
image_debug_info_state state = image->ImageDebugInfoState();
bool handlePostExecSetup = fExecPending && image->Type() == B_APP_IMAGE
&& state != IMAGE_DEBUG_INFO_LOADING;
// this needs to be done first so that breakpoints are loaded.
// otherwise, UpdateImageBreakpoints() won't find the appropriate
// UserBreakpoints to create/install instances for.
if (handlePostExecSetup) {
fTeam->SetName(image->Name());
_LoadSettings();
fExecPending = false;
}
locker.Unlock();
image_debug_info_state state = image->ImageDebugInfoState();
if (state == IMAGE_DEBUG_INFO_LOADED
|| state == IMAGE_DEBUG_INFO_UNAVAILABLE) {
// update breakpoints in the image
@@ -1875,9 +1931,9 @@ TeamDebugger::_HandleImageDebugInfoChanged(image_id imageID)
fImageInfoPendingThreads->Remove(thread);
ObjectDeleter<ImageInfoPendingThread> threadDeleter(thread);
locker.Lock();
ThreadHandler* handler = _GetThreadHandler(thread->ThreadID());
BReference<ThreadHandler> handlerReference(handler);
if (fTeam->StopOnImageLoad()) {
ThreadHandler* handler = _GetThreadHandler(thread->ThreadID());
BReference<ThreadHandler> handlerReference(handler);
bool stop = true;
const BString& imageName = image->Name();
@@ -1899,10 +1955,19 @@ TeamDebugger::_HandleImageDebugInfoChanged(image_id imageID)
return;
} else
locker.Unlock();
} else
} else if (handlePostExecSetup) {
// in the case of an exec(), we can't stop in main() until
// the new app image has been loaded, so we know where to
// set the main breakpoint at.
SymbolInfo symbolInfo;
if (fDebuggerInterface->GetSymbolInfo(fTeam->ID(), image->ID(),
"main", B_SYMBOL_TYPE_TEXT, symbolInfo) == B_OK) {
handler->SetBreakpointAndRun(symbolInfo.Address());
}
} else {
locker.Unlock();
fDebuggerInterface->ContinueThread(thread->ThreadID());
fDebuggerInterface->ContinueThread(thread->ThreadID());
}
}
}
}
src/apps/debugger/controllers/TeamDebugger.h
+3
View File
@@ -184,6 +184,8 @@ private:
bool _HandlePostSyscall(
PostSyscallEvent* event);
void _PrepareForTeamExec(TeamExecEvent* event);
void _HandleImageDebugInfoChanged(image_id imageID);
void _HandleImageFileChanged(image_id imageID);
@@ -259,6 +261,7 @@ private:
TeamSettings fTeamSettings;
int fCommandLineArgc;
const char** fCommandLineArgv;
bool fExecPending;
};
src/apps/debugger/controllers/ThreadHandler.cpp
+2 -3
View File
@@ -126,9 +126,8 @@ ThreadHandler::SetBreakpointAndRun(target_addr_t address)
return error;
fPreviousInstructionPointer = 0;
resume_thread(ThreadID());
// TODO: This should probably better be a DebuggerInterface method,
// but this method is used only when debugging a local team anyway.
fDebuggerInterface->ContinueThread(ThreadID());
// Pretend "step out" mode, so that the temporary breakpoint hit will not
// be ignored.
fStepMode = STEP_OUT;
src/apps/debugger/model/Team.cpp
+32
View File
@@ -120,6 +120,7 @@ void
Team::SetName(const BString& name)
{
fName = name;
_NotifyTeamRenamed();
}
@@ -277,6 +278,14 @@ Team::Images() const
}
void
Team::ClearImages()
{
while (!fImages.IsEmpty())
RemoveImage(fImages.First());
}
bool
Team::AddStopImageName(const BString& name)
{
@@ -377,6 +386,13 @@ Team::GetSignalDispositionMappings() const
}
void
Team::ClearSignalDispositionMappings()
{
fCustomSignalDispositions.clear();
}
bool
Team::AddBreakpoint(Breakpoint* breakpoint)
{
@@ -847,6 +863,16 @@ Team::NotifyMemoryChanged(target_addr_t address, target_size_t size)
}
void
Team::_NotifyTeamRenamed()
{
for (ListenerList::Iterator it = fListeners.GetIterator();
Listener* listener = it.Next();) {
listener->TeamRenamed(Event(TEAM_EVENT_TEAM_RENAMED, this));
}
}
void
Team::_NotifyThreadAdded(Thread* thread)
{
@@ -1052,6 +1078,12 @@ Team::Listener::~Listener()
}
void
Team::Listener::TeamRenamed(const Team::Event& event)
{
}
void
Team::Listener::ThreadAdded(const Team::ThreadEvent& event)
{
src/apps/debugger/model/Team.h
+9
View File
@@ -24,6 +24,8 @@
// team event types
enum {
TEAM_EVENT_TEAM_RENAMED,
TEAM_EVENT_THREAD_ADDED,
TEAM_EVENT_THREAD_REMOVED,
TEAM_EVENT_IMAGE_ADDED,
@@ -137,6 +139,7 @@ public:
Image* ImageByID(image_id imageID) const;
Image* ImageByAddress(target_addr_t address) const;
const ImageList& Images() const;
void ClearImages();
bool AddStopImageName(const BString& name);
void RemoveStopImageName(const BString& name);
@@ -161,6 +164,8 @@ public:
const SignalDispositionMappings&
GetSignalDispositionMappings() const;
void ClearSignalDispositionMappings();
bool AddBreakpoint(Breakpoint* breakpoint);
// takes over reference (also on error)
void RemoveBreakpoint(Breakpoint* breakpoint);
@@ -270,6 +275,7 @@ private:
typedef DoublyLinkedList<Listener> ListenerList;
private:
void _NotifyTeamRenamed();
void _NotifyThreadAdded(Thread* thread);
void _NotifyThreadRemoved(Thread* thread);
void _NotifyImageAdded(Image* image);
@@ -471,6 +477,9 @@ class Team::Listener : public DoublyLinkedListLinkImpl<Team::Listener> {
public:
virtual ~Listener();
virtual void TeamRenamed(
const Team::Event& event);
virtual void ThreadAdded(const Team::ThreadEvent& event);
virtual void ThreadRemoved(const Team::ThreadEvent& event);
src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
+98 -65
View File
@@ -73,7 +73,8 @@ enum {
MSG_DEBUG_REPORT_SAVED = 'drsa',
MSG_LOCATE_SOURCE_IF_NEEDED = 'lsin',
MSG_SOURCE_ENTRY_QUERY_COMPLETE = 'seqc',
MSG_CLEAR_STACK_TRACE = 'clst'
MSG_CLEAR_STACK_TRACE = 'clst',
MSG_HANDLE_LOAD_SETTINGS = 'hlst'
};
@@ -145,12 +146,7 @@ TeamWindow::TeamWindow(::Team* team, UserInterfaceListener* listener)
fFilePanel(NULL),
fActiveSourceWorker(-1)
{
fTeam->Lock();
BString name = fTeam->Name();
fTeam->Unlock();
if (fTeam->ID() >= 0)
name << " (" << fTeam->ID() << ")";
SetTitle(name.String());
_UpdateTitle();
fTeam->AddListener(this);
}
@@ -518,6 +514,22 @@ TeamWindow::MessageReceived(BMessage* message)
}
break;
}
case MSG_HANDLE_LOAD_SETTINGS:
{
GuiTeamUiSettings* settings;
if (message->FindPointer("settings",
reinterpret_cast<void**>(&settings)) != B_OK) {
break;
}
_LoadSettings(settings);
break;
}
case MSG_TEAM_RENAMED:
{
_UpdateTitle();
break;
}
case MSG_THREAD_STATE_CHANGED:
{
int32 threadID;
@@ -617,64 +629,9 @@ TeamWindow::QuitRequested()
status_t
TeamWindow::LoadSettings(const GuiTeamUiSettings* settings)
{
AutoLocker<BWindow> lock(this);
if (!lock.IsLocked())
return B_ERROR;
BMessage teamWindowSettings;
// no settings stored yet
if (settings->Settings("teamWindow", teamWindowSettings) != B_OK)
return B_OK;
BRect frame;
if (teamWindowSettings.FindRect("frame", &frame) == B_OK) {
ResizeTo(frame.Width(), frame.Height());
MoveTo(frame.left, frame.top);
}
BMessage archive;
if (teamWindowSettings.FindMessage("sourceSplit", &archive) == B_OK)
GuiSettingsUtils::UnarchiveSplitView(archive, fSourceSplitView);
if (teamWindowSettings.FindMessage("functionSplit", &archive) == B_OK)
GuiSettingsUtils::UnarchiveSplitView(archive, fFunctionSplitView);
if (teamWindowSettings.FindMessage("imageSplit", &archive) == B_OK)
GuiSettingsUtils::UnarchiveSplitView(archive, fImageSplitView);
if (teamWindowSettings.FindMessage("threadSplit", &archive) == B_OK)
GuiSettingsUtils::UnarchiveSplitView(archive, fThreadSplitView);
if (teamWindowSettings.FindMessage("consoleSplit", &archive) == B_OK)
GuiSettingsUtils::UnarchiveSplitView(archive, fConsoleSplitView);
if (teamWindowSettings.FindMessage("imageListView", &archive) == B_OK)
fImageListView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("imageFunctionsView", &archive) == B_OK)
fImageFunctionsView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("threadListView", &archive) == B_OK)
fThreadListView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("variablesView", &archive) == B_OK)
fVariablesView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("registersView", &archive) == B_OK)
fRegistersView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("stackTraceView", &archive) == B_OK)
fStackTraceView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("breakpointsView", &archive) == B_OK)
fBreakpointsView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("consoleOutputView", &archive) == B_OK)
fConsoleOutputView->LoadSettings(archive);
fUiSettings = *settings;
return B_OK;
BMessage message(MSG_HANDLE_LOAD_SETTINGS);
message.AddPointer("settings", settings);
return PostMessage(&message);
}
@@ -905,6 +862,13 @@ TeamWindow::ValueNodeWriteRequested(ValueNode* node, CpuState* state,
}
void
TeamWindow::TeamRenamed(const Team::Event& event)
{
PostMessage(MSG_TEAM_RENAMED);
}
void
TeamWindow::ThreadStateChanged(const Team::ThreadEvent& event)
{
@@ -1141,6 +1105,75 @@ TeamWindow::_Init()
}
void
TeamWindow::_LoadSettings(const GuiTeamUiSettings* settings)
{
BMessage teamWindowSettings;
// no settings stored yet
if (settings->Settings("teamWindow", teamWindowSettings) != B_OK)
return;
BRect frame;
if (teamWindowSettings.FindRect("frame", &frame) == B_OK) {
ResizeTo(frame.Width(), frame.Height());
MoveTo(frame.left, frame.top);
}
BMessage archive;
if (teamWindowSettings.FindMessage("sourceSplit", &archive) == B_OK)
GuiSettingsUtils::UnarchiveSplitView(archive, fSourceSplitView);
if (teamWindowSettings.FindMessage("functionSplit", &archive) == B_OK)
GuiSettingsUtils::UnarchiveSplitView(archive, fFunctionSplitView);
if (teamWindowSettings.FindMessage("imageSplit", &archive) == B_OK)
GuiSettingsUtils::UnarchiveSplitView(archive, fImageSplitView);
if (teamWindowSettings.FindMessage("threadSplit", &archive) == B_OK)
GuiSettingsUtils::UnarchiveSplitView(archive, fThreadSplitView);
if (teamWindowSettings.FindMessage("consoleSplit", &archive) == B_OK)
GuiSettingsUtils::UnarchiveSplitView(archive, fConsoleSplitView);
if (teamWindowSettings.FindMessage("imageListView", &archive) == B_OK)
fImageListView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("imageFunctionsView", &archive) == B_OK)
fImageFunctionsView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("threadListView", &archive) == B_OK)
fThreadListView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("variablesView", &archive) == B_OK)
fVariablesView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("registersView", &archive) == B_OK)
fRegistersView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("stackTraceView", &archive) == B_OK)
fStackTraceView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("breakpointsView", &archive) == B_OK)
fBreakpointsView->LoadSettings(archive);
if (teamWindowSettings.FindMessage("consoleOutputView", &archive) == B_OK)
fConsoleOutputView->LoadSettings(archive);
fUiSettings = *settings;
}
void
TeamWindow::_UpdateTitle()
{
AutoLocker< ::Team> lock(fTeam);
BString name = fTeam->Name();
if (fTeam->ID() >= 0)
name << " (" << fTeam->ID() << ")";
SetTitle(name.String());
}
void
TeamWindow::_SetActiveThread(::Thread* thread)
{
src/apps/debugger/user_interface/gui/team_window/TeamWindow.h
+5
View File
@@ -134,6 +134,7 @@ private:
CpuState* state, Value* value);
// Team::Listener
virtual void TeamRenamed(const Team::Event& event);
virtual void ThreadStateChanged(
const Team::ThreadEvent& event);
virtual void ThreadCpuStateChanged(
@@ -157,6 +158,10 @@ private:
void _Init();
void _LoadSettings(
const GuiTeamUiSettings* settings);
void _UpdateTitle();
void _SetActiveThread(::Thread* thread);
void _SetActiveImage(Image* image);
void _SetActiveStackTrace(StackTrace* stackTrace);
src/apps/debugger/user_interface/util/UiUtils.cpp
+3 -2
View File
@@ -337,6 +337,9 @@ UiUtils::DumpMemory(BString& _output, int32 indentLevel,
int32 j;
_output.Append('\t', indentLevel);
for (int32 i = 0; i < count; i++) {
if (!block->Contains(address + i * itemSize))
break;
uint8* value;
if ((i % displayWidth) == 0) {
@@ -350,8 +353,6 @@ UiUtils::DumpMemory(BString& _output, int32 indentLevel,
_output += data;
char c;
for (j = 0; j < displayed; j++) {
if (!block->Contains(address + displayed))
break;
c = *(block->Data() + address - block->BaseAddress()
+ (i * itemSize) + j);
if (!isprint(c))
src/apps/glteapot/error.h
+2
View File
@@ -12,6 +12,8 @@ extern void fatalerror(const char *);
#define DEBUGGING 1
#undef assert
#ifdef DEBUGGING
#define assert(a) if (!(a)) { \
src/apps/haikudepot/model/WebAppInterface.cpp
+66 -7
View File
@@ -7,22 +7,28 @@
#include <stdio.h>
#include <AppFileInfo.h>
#include <Application.h>
#include <Autolock.h>
#include <File.h>
#include <HttpHeaders.h>
#include <HttpRequest.h>
#include <Json.h>
#include <Message.h>
#include <Roster.h>
#include <Url.h>
#include <UrlContext.h>
#include <UrlProtocolListener.h>
#include <UrlProtocolRoster.h>
#include "AutoLocker.h"
#include "List.h"
#include "PackageInfo.h"
#define CODE_REPOSITORY_DEFAULT "haikuports"
#define BASEURL_DEFAULT "https://depot.haiku-os.org"
#define USERAGENT_FALLBACK_VERSION "0.0.0"
class JsonBuilder {
@@ -274,7 +280,8 @@ enum {
BString WebAppInterface::fBaseUrl = BString(BASEURL_DEFAULT);
BString WebAppInterface::fUserAgent = BString();
BLocker WebAppInterface::fUserAgentLocker = BLocker();
WebAppInterface::WebAppInterface()
:
@@ -337,7 +344,7 @@ arguments_is_url_valid(const BString& value)
BString scheme;
value.CopyInto(scheme, 0, schemeEnd);
if (scheme != "http" && scheme != "https") {
fprintf(stderr, "the url scheme should be 'http' or 'https'\n");
return false;
@@ -356,7 +363,7 @@ arguments_is_url_valid(const BString& value)
indicate if the URL was acceptable.
\return B_OK if the base URL was valid and B_BAD_VALUE if not.
*/
status_t
status_t
WebAppInterface::SetBaseUrl(const BString& url)
{
if (!arguments_is_url_valid(url))
@@ -368,6 +375,60 @@ WebAppInterface::SetBaseUrl(const BString& url)
}
const BString
WebAppInterface::_GetUserAgentVersionString()
{
app_info info;
if (be_app->GetAppInfo(&info) != B_OK) {
fprintf(stderr, "Unable to get the application info\n");
be_app->Quit();
return BString(USERAGENT_FALLBACK_VERSION);
}
BFile file(&info.ref, B_READ_ONLY);
if (file.InitCheck() != B_OK) {
fprintf(stderr, "Unable to access the application info file\n");
be_app->Quit();
return BString(USERAGENT_FALLBACK_VERSION);
}
BAppFileInfo appFileInfo(&file);
version_info versionInfo;
if (appFileInfo.GetVersionInfo(
&versionInfo, B_APP_VERSION_KIND) != B_OK) {
fprintf(stderr, "Unable to establish the application version\n");
be_app->Quit();
return BString(USERAGENT_FALLBACK_VERSION);
}
BString result;
result.SetToFormat("%" B_PRId32 ".%" B_PRId32 ".%" B_PRId32,
versionInfo.major, versionInfo.middle, versionInfo.minor);
return result;
}
/*! This method will devise a suitable User-Agent header value that
can be transmitted with HTTP requests to the server in order
to identify this client.
*/
const BString
WebAppInterface::_GetUserAgent()
{
AutoLocker<BLocker> lock(&fUserAgentLocker);
if (fUserAgent.IsEmpty()) {
fUserAgent.SetTo("HaikuDepot/");
fUserAgent.Append(_GetUserAgentVersionString());
}
return fUserAgent;
}
void
WebAppInterface::SetPreferredLanguage(const BString& language)
{
@@ -592,7 +653,7 @@ WebAppInterface::RetrieveScreenshot(const BString& code,
listener.SetDownloadIO(stream);
BHttpHeaders headers;
headers.AddHeader("User-Agent", "X-HDS-Client");
headers.AddHeader("User-Agent", _GetUserAgent());
BHttpRequest request(url, isSecure, "HTTP", &listener);
request.SetMethod(B_HTTP_GET);
@@ -715,7 +776,7 @@ WebAppInterface::_SendJsonRequest(const char* domain, BString jsonString,
BHttpHeaders headers;
headers.AddHeader("Content-Type", "application/json");
headers.AddHeader("User-Agent", "X-HDS-Client");
headers.AddHeader("User-Agent", _GetUserAgent());
BHttpRequest request(url, isSecure, "HTTP", &listener, &context);
request.SetMethod(B_HTTP_POST);
@@ -764,5 +825,3 @@ WebAppInterface::_SendJsonRequest(const char* domain, BString jsonString,
}
return status;
}
src/apps/haikudepot/model/WebAppInterface.h
+4
View File
@@ -101,6 +101,8 @@ public:
BMessage& message);
private:
static const BString _GetUserAgentVersionString();
static const BString _GetUserAgent();
BString _FormFullUrl(const BString& suffix) const;
status_t _SendJsonRequest(const char* domain,
BString jsonString, uint32 flags,
@@ -108,6 +110,8 @@ private:
private:
static BString fBaseUrl;
static BString fUserAgent;
static BLocker fUserAgentLocker;
BString fUsername;
BString fPassword;
BString fLanguage;
src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
+5
View File
@@ -170,8 +170,13 @@ VideoProducer::HandleEvent(const media_timed_event* event,
_HandleStart(event->event_time);
break;
case BTimedEventQueue::B_STOP:
{
EventQueue()->FlushEvents(event->event_time,
BTimedEventQueue::B_ALWAYS,
true, BTimedEventQueue::B_HANDLE_BUFFER);
_HandleStop();
break;
}
case BTimedEventQueue::B_WARP:
_HandleTimeWarp(event->bigdata);
break;
src/apps/packageinstaller/PackageItem.cpp
+3 -4
View File
@@ -9,6 +9,7 @@
#include "PackageItem.h"
#include <stdlib.h>
#include <string.h>
#include <Alert.h>
@@ -43,8 +44,6 @@ enum {
P_ATTRIBUTE
};
extern const char **environ;
status_t
inflate_data(uint8 *in, uint32 inSize, uint8 *out, uint32 outSize)
@@ -748,7 +747,7 @@ PackageScript::_RunScript(const char* workingDirectory, const BString& script)
int old_in = dup(0);
int old_out = dup(1);
int old_err = dup(2);
int filedes[2];
/* Create new pipe FDs as stdin, stdout, stderr */
@@ -763,7 +762,7 @@ PackageScript::_RunScript(const char* workingDirectory, const BString& script)
argv[2] = NULL;
// "load" command.
fThreadId = load_image(2, argv, environ);
fThreadId = load_image(2, argv, (const char**)environ);
int i;
for (i = 0; i < 2; i++)
src/apps/patchbay/Jamfile
+1 -1
View File
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src apps patchbay ;
SetSubDirSupportedPlatformsBeOSCompatible ;
SimpleTest PatchBay
Application PatchBay
:
PatchApp.cpp
PatchWin.cpp
src/apps/remotedesktop/RemoteView.cpp
+3 -3
View File
@@ -39,9 +39,9 @@ static const uint8 kCursorData[] = { 16 /* size, 16x16 */,
};
#define TRACE(x...) /*printf("RemoteView: "x)*/
#define TRACE_ALWAYS(x...) printf("RemoteView: "x)
#define TRACE_ERROR(x...) printf("RemoteView: "x)
#define TRACE(x...) /*printf("RemoteView: " x)*/
#define TRACE_ALWAYS(x...) printf("RemoteView: " x)
#define TRACE_ERROR(x...) printf("RemoteView: " x)
typedef struct engine_state {
src/apps/screenshot/Screenshot.cpp
+1 -1
View File
@@ -308,7 +308,7 @@ Screenshot::_GetActiveWindowFrame()
token = tokens[i];
windowInfo = get_window_info(token);
if (windowInfo && !windowInfo->is_mini
&& !windowInfo->show_hide_level > 0) {
&& !(windowInfo->show_hide_level > 0)) {
foundActiveWindow = true;
break;
}
src/apps/screenshot/ScreenshotWindow.cpp
+7 -1
View File
@@ -439,7 +439,12 @@ ScreenshotWindow::_NewScreenshot(bool silent, bool clipboard)
void
ScreenshotWindow::_UpdatePreviewPanel()
{
float height = 150.0f;
// Set the height of fPreview to what the layout suggests
fPreview->SetExplicitMinSize(BSize());
fPreview->SetExplicitMaxSize(BSize());
Layout(false);
float height = fPreview->Bounds().Height();
float width = (fScreenshot->Bounds().Width()
/ fScreenshot->Bounds().Height()) * height;
@@ -451,6 +456,7 @@ ScreenshotWindow::_UpdatePreviewPanel()
}
fPreview->SetExplicitMinSize(BSize(width, height));
fPreview->SetExplicitMaxSize(BSize(width, height));
fPreview->ClearViewBitmap();
fPreview->SetViewBitmap(fScreenshot, fScreenshot->Bounds(),
src/apps/terminal/TermViewStates.cpp
+13 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2001-2013, Haiku, Inc.
* Copyright 2001-2015, Haiku, Inc.
* Copyright 2003-2004 Kian Duffy, myob@users.sourceforge.net
* Parts Copyright 1998-1999 Kazuho Okui and Takashi Murai.
* All rights reserved. Distributed under the terms of the MIT license.
@@ -23,8 +23,10 @@
#include <Catalog.h>
#include <Clipboard.h>
#include <Cursor.h>
#include <FindDirectory.h>
#include <LayoutBuilder.h>
#include <MessageRunner.h>
#include <Path.h>
#include <PopUpMenu.h>
#include <ScrollBar.h>
#include <UTF8.h>
@@ -896,7 +898,8 @@ TermView::HyperLinkState::_GetHyperLinkAt(BPoint where, bool pathPrefixOnly,
path.Truncate(colonIndex);
if (_EntryExists(path, actualPath)) {
BString address = path == actualPath
? text : BString(fCurrentDirectory) << '/' << text;
? text
: BString(actualPath) << (text.String() + colonIndex);
_link = HyperLink(text, address,
i == 0
? HyperLink::TYPE_PATH_WITH_LINE
@@ -920,6 +923,14 @@ TermView::HyperLinkState::_EntryExists(const BString& path,
if (path[0] == '/' || fCurrentDirectory.IsEmpty()) {
_actualPath = path;
} else if (path == "~" || path.StartsWith("~/")) {
// Replace '~' with the user's home directory. We don't handle "~user"
// here yet.
BPath homeDirectory;
if (find_directory(B_USER_DIRECTORY, &homeDirectory) != B_OK)
return false;
_actualPath = homeDirectory.Path();
_actualPath << path.String() + 1;
} else {
_actualPath.Truncate(0);
_actualPath << fCurrentDirectory << '/' << path;
src/apps/tv/config.h
+3 -3
View File
@@ -31,9 +31,9 @@
#define NAME "TV"
#define REVISION "unknown"
#define VERSION "1.1"
#define BUILD __DATE__ " "__TIME__
#define COPYRIGHT B_UTF8_COPYRIGHT" Marcus Overhagen 2005-2007"
#define BUILD __DATE__ " " __TIME__
#define COPYRIGHT B_UTF8_COPYRIGHT " Marcus Overhagen 2005-2007"
#define INFO1 "DVB - Digital Video Broadcasting TV"
#define APP_SIG "application/x-vnd.Haiku."NAME
#define APP_SIG "application/x-vnd.Haiku." NAME
#endif

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