[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey configMakefile.in distrib/ChangeLog sr...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey configMakefile.in distrib/ChangeLog sr... |
|
Date: |
Tue, 06 Jun 2006 22:32:44 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/06/06 22:32:44
Modified files:
config : Makefile.in
distrib : ChangeLog
src/daemon/common: commonMultimedia.ml
Removed files:
src/utils/lib : avifile.ml
Log message:
patch #5160
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.159&r2=1.160
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.872&r2=1.873
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonMultimedia.ml?cvsroot=mldonkey&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/avifile.ml?cvsroot=mldonkey&r1=1.7&r2=0
Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- config/Makefile.in 15 May 2006 17:43:09 -0000 1.159
+++ config/Makefile.in 6 Jun 2006 22:32:44 -0000 1.160
@@ -184,7 +184,7 @@
$(LIB)/hole_tab.ml $(LIB)/store.ml \
$(LIB)/indexer.ml $(LIB)/indexer1.ml $(LIB)/indexer2.ml $(LIB)/host.ml \
$(LIB)/misc2.mlcpp $(LIB)/misc.ml $(LIB)/unix32.ml $(LIB)/md4.ml \
- $(LIB)/avifile.ml $(LIB)/http_lexer.mll $(LIB)/url.ml \
+ $(LIB)/http_lexer.mll $(LIB)/url.ml \
$(RSS)/rss_date.ml \
$(LIB)/date.ml $(LIB)/fst_hash.c \
$(LIB)/md4_comp.c $(LIB)/md4_c.c \
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.872
retrieving revision 1.873
diff -u -b -r1.872 -r1.873
--- distrib/ChangeLog 6 Jun 2006 22:31:18 -0000 1.872
+++ distrib/ChangeLog 6 Jun 2006 22:32:44 -0000 1.873
@@ -15,6 +15,7 @@
=========
2006/06/07
+5160: Remove stale avifile.ml, clean commonMultimedia logging
5159: Compute magic values only when needed
5157: add some line breaks to option help text for shorter lines (schlumpf)
Index: src/daemon/common/commonMultimedia.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonMultimedia.ml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/daemon/common/commonMultimedia.ml 3 Apr 2006 20:50:08 -0000
1.13
+++ src/daemon/common/commonMultimedia.ml 6 Jun 2006 22:32:44 -0000
1.14
@@ -546,19 +546,19 @@
let fccType = input_string4 ic in
let fccHandler = input_string4 ic in
- let dwFlags = input_int32 ic in (* Contains AVITF_* flags *)
- let wPriority = input_int16 ic in
- let wLanguage = input_int16 ic in
- let dwInitialFrames = input_int32 ic in
+ let _dwFlags = input_int32 ic in (* Contains AVITF_* flags *)
+ let _wPriority = input_int16 ic in
+ let _wLanguage = input_int16 ic in
+ let _dwInitialFrames = input_int32 ic in
let dwScale = input_int32 ic in
let dwRate = input_int32 ic in (* dwRate / dwScale ==
samples/second *)
- let dwStart = input_int32 ic in
+ let _dwStart = input_int32 ic in
let dwLength = input_int32 ic in
- let dwSuggestedBufferSize = input_int32 ic in
- let dwQuality = input_int32 ic in
- let dwSampleSize = input_int32 ic in
- let rcFrame_x = input_int16 ic in
- let rcFrame_y = input_int16 ic in
+ let _dwSuggestedBufferSize = input_int32 ic in
+ let _dwQuality = input_int32 ic in
+ let _dwSampleSize = input_int32 ic in
+ let _rcFrame_x = input_int16 ic in
+ let _rcFrame_y = input_int16 ic in
let rcFrame_dx = input_int16 ic in
let rcFrame_dy = input_int16 ic in
@@ -573,6 +573,7 @@
+(*
print_string4 "fccType" fccType;
print_string4 "fccHandler" fccHandler;
print_int32 "dwFlags " dwFlags; (* Contains AVITF_* flags *)
@@ -590,6 +591,7 @@
print_int16 "rcFrame_y" rcFrame_y;
print_int16 "rcFrame_dx" rcFrame_dx;
print_int16 "rcFrame_dy" rcFrame_dy;
+*)
()
| _ -> ()
end;
Index: src/utils/lib/avifile.ml
===================================================================
RCS file: src/utils/lib/avifile.ml
diff -N src/utils/lib/avifile.ml
--- src/utils/lib/avifile.ml 3 Apr 2006 20:50:09 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,225 +0,0 @@
-(* Copyright 2001, 2002 b8_bavard, b8_fee_carabine, INRIA *)
-(*
- This file is part of mldonkey.
-
- mldonkey 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.
-
- mldonkey 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 mldonkey; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*)
-
-open Int64ops
-open Printf2
-
-(*
- RIFF('AVI'
- * LIST('hdrl'
- * avih(<MainAVIHeader>)
- * LIST ('strl'
- * strh(<Stream header>)
- * strf(<Stream format>)
- * ... additional header data
- * LIST('movi'
- * { LIST('rec'
- * SubChunk...
- * )
- * | SubChunk } ....
- * )
- * [ <AVIIndex> ]
- * )
- /* form types, list types, and chunk types */
-#define formtypeAVI mmioFOURCC('A', 'V', 'I', ' ')
-#define listtypeAVIHEADER mmioFOURCC('h', 'd', 'r', 'l')
-#define ckidAVIMAINHDR mmioFOURCC('a', 'v', 'i', 'h')
-#define listtypeSTREAMHEADER mmioFOURCC('s', 't', 'r', 'l')
-#define ckidSTREAMHEADER mmioFOURCC('s', 't', 'r', 'h')
-#define ckidSTREAMFORMAT mmioFOURCC('s', 't', 'r', 'f')
-#define ckidSTREAMHANDLERDATA mmioFOURCC('s', 't', 'r', 'd')
-#define ckidSTREAMNAME mmioFOURCC('s', 't', 'r', 'n')
-
-#define listtypeAVIMOVIE mmioFOURCC('m', 'o', 'v', 'i')
-#define listtypeAVIRECORD mmioFOURCC('r', 'e', 'c', ' ')
-
-#define ckidAVINEWINDEX mmioFOURCC('i', 'd', 'x', '1')
-
-/*
-** Stream types for the <fccType> field of the stream header.
-*/
-#define streamtypeVIDEO mmioFOURCC('v', 'i', 'd', 's')
-#define streamtypeAUDIO mmioFOURCC('a', 'u', 'd', 's')
-#define streamtypeMIDI mmioFOURCC('m', 'i', 'd', 's')
-#define streamtypeTEXT mmioFOURCC('t', 'x', 't', 's')
-
-/* Basic chunk types */
-#define cktypeDIBbits aviTWOCC('d', 'b')
-#define cktypeDIBcompressed aviTWOCC('d', 'c')
-#define cktypePALchange aviTWOCC('p', 'c')
-#define cktypeWAVEbytes aviTWOCC('w', 'b')
-
-/* Chunk id to use for extra chunks for padding. */
-#define ckidAVIPADDING mmioFOURCC('J', 'U', 'N', 'K')
-
-
-*)
-let input_int8 ic =
- int_of_char (input_char ic)
-
-let input_int16 ic =
- let i0 = input_int8 ic in
- let i1 = input_int8 ic in
- i0 lor (i1 lsl 8)
-
-let input_int32 ic =
- let i0 = input_int16 ic in
- let i1 = input_int16 ic in
- let i0 = Int64.of_int i0 in
- let i1 = Int64.of_int i1 in
- Int64.add i0 (Int64.shift_left i1 16)
-
-let input_int ic =
- let i0 = input_int16 ic in
- let i1 = input_int16 ic in
- i0 lor (i1 lsl 16)
-
-let input_string4 ic =
- let s = String.create 4 in
- really_input ic s 0 4;
- s
-
-let print_string4 v s =
- lprintf "%s :" v;
- for i = 0 to 3 do
- let c = s.[i] in
- let int = int_of_char c in
- if int > 31 && int <127 then
- lprint_char c
- else lprintf "[%d]" int
- done
-
-let print_int32 s i=
- lprintf_nl "%s: %s" s (Int64.to_string i)
-
-let print_int16 s i=
- lprintf "%s: %d" s i
-
-let load file =
- Unix2.tryopen_read file (fun ic ->
-(* pos: 0 *)
- let s = input_string4 ic in
- if s <> "RIFF" then failwith "Not an AVI file (RIFF absent)";
-
-(* pos: 4 *)
- let size = input_int32 ic in
- lprintf_nl "SIZE %s" (Int64.to_string size);
-
-(* pos: 8 *)
- let s = input_string4 ic in
- if s <> "AVI " then failwith "Not an AVI file (AVI absent)";
-
-(* pos: 12 *)
- let s = input_string4 ic in
- if s <> "LIST" then failwith "Not an AVI file (LIST absent)";
-
-(* position 16 *)
- let rec iter_list pos end_pos =
- lprintf_nl "POS %s/%s" (Int64.to_string pos) (Int64.to_string end_pos);
- if pos < end_pos then begin
-(* on peut s'arreter quand size = 0 *)
- seek_in ic (Int64.to_int pos);
- let size2 = input_int32 ic in
- lprintf_nl "SIZE2 %s" (Int64.to_string size2);
-
- let header_name = input_string4 ic in
- print_string4 "header" header_name; lprint_newline ();
-(* pos: pos + 8 *)
- begin
- match header_name with
- "hdrl" ->
- lprintf_nl "HEADER";
-
- let s = input_string4 ic in
- if s <> "avih" then failwith "Bad AVI file (avih absent)";
-
-(* pos: pos + 12 *)
- let main_header_len = 52 in
-
- ignore (input_string4 ic);
-
- seek_in ic ((Int64.to_int pos) + main_header_len + 20);
-
- let pos_in = pos ++ (Int64.of_int (main_header_len + 24)) in
- let last_pos = pos_in ++ size2 in
- iter_list pos_in last_pos
-
- | "movi" ->
- lprintf_nl "CHUNKS"
-
- | "strl" ->
- lprintf_nl "STREAM DESCRIPTION";
-
- let offset = 4L in
- let pos0 = pos ++ offset in
- let end_pos0 = pos ++ size2 in
- iter_list pos0 end_pos0
-
- | "strh" ->
- lprintf_nl "STREAM HEADER";
-
- ignore (input_string4 ic);
-
- let fccType = input_string4 ic in
- let fccHandler = input_string4 ic in
- let dwFlags = input_int32 ic in (* Contains AVITF_* flags *)
- let wPriority = input_int16 ic in
- let wLanguage = input_int16 ic in
- let dwInitialFrames = input_int32 ic in
- let dwScale = input_int32 ic in
- let dwRate = input_int32 ic in (* dwRate / dwScale ==
samples/second *)
- let dwStart = input_int32 ic in
- let dwLength = input_int32 ic in
- let dwSuggestedBufferSize = input_int32 ic in
- let dwQuality = input_int32 ic in
- let dwSampleSize = input_int32 ic in
- let rcFrame_x = input_int16 ic in
- let rcFrame_y = input_int16 ic in
- let rcFrame_dx = input_int16 ic in
- let rcFrame_dy = input_int16 ic in
-
- print_string4 "fccType" fccType;
- print_string4 "fccHandler" fccHandler;
- print_int32 "dwFlags " dwFlags; (* Contains AVITF_* flags *)
- print_int16 "wPriority" wPriority;
- print_int16 "wLanguage" wLanguage;
- print_int32 "dwInitialFrames " dwInitialFrames;
- print_int32 "dwScale " dwScale;
- print_int32 "dwRate " dwRate; (* dwRate / dwScale ==
samples/second *)
- print_int32 "dwStart " dwStart;
- print_int32 "dwLength " dwLength;
- print_int32 "dwSuggestedBufferSize " dwSuggestedBufferSize;
- print_int32 "dwQuality " dwQuality;
- print_int32 "dwSampleSize " dwSampleSize;
- print_int16 "rcFrame_x" rcFrame_x;
- print_int16 "rcFrame_y" rcFrame_y;
- print_int16 "rcFrame_dx" rcFrame_dx;
- print_int16 "rcFrame_dy" rcFrame_dy;
- ()
-
- | _ -> ()
- end;
-
- iter_list (pos ++ size2 ++ 8L) end_pos
- end
-
- in
- let pos0 = 16L in
- iter_list pos0 (pos0 ++ size))
-
- [Mldonkey-commits] mldonkey configMakefile.in distrib/ChangeLog sr...,
mldonkey-commits <=