Changeset 62e73f508b74167e0a9ceec13b155abb2f7aaaa0

Show
Ignore:
Timestamp:
06/20/02 00:47:14 (6 years ago)
Author:
Christophe Massiot <massiot@videolan.org>
git-committer:
Christophe Massiot <massiot@videolan.org> 1024526834 +0000
git-parent:

[e405691afcb7d6c9d4e0917da3565fbe149114e3]

git-author:
Christophe Massiot <massiot@videolan.org> 1024526834 +0000
Message:

Backported stable changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • ChangeLog

    r74ea8fa r62e73f5  
    6868 
    69690.4.2 
    70 Not released yet 
    71  
    72   * ./plugins/gtk/gnome_callbacks.c: fixed a crash when activating preferences  
     70Mon, 20 Jun 2002 00:41:26 +0200 
     71 
     72  * ./plugins/macosx: new controls for audio output, and deinterlacing 
     73    support. 
     74  * ./plugins/macosx: fixed a bug with language and subtitle menus. 
     75  * ./plugins/access/http.c: should be more tolerant with old servers and 
     76    non-seekable streams. 
     77  * ./plugins/filter/deinterlace.c: backported new deinterlacing routines. 
     78  * ./include/threads.h, ./include/threads_funcs.h: backported the new Win32 
     79    cond_wait implementation from MAIN. 
     80  * ./plugins/gtk/gnome_callbacks.c: fixed a crash when activating preferences 
    7381    from the popup menu. 
    7482 
  • README.MacOSX.rtf

    re405691 r62e73f5  
    8383\ 
    8484\ 
     85 
     86\f1\b \ul 9. How do I enable deinterlacing ?\ 
     87 
     88\f0\b0 \ulnone You must select the "Deinterlace" menu item  
     89\f1\b before 
     90\f0\b0  opening any file. If the item is selected while reading a file, nothing will happen. This is a known issue, please do not report it.\ 
     91\ 
     92\ 
    8593Thanks for reading this file. For additional information, subscribe to the vlc mailing list on \ul http://www.videolan.org/.\ulnone \ 
    8694-- \ 
    8795Christophe Massiot <massiot@via.ecp.fr>, for the VideoLAN team.\ 
    88 $Id: README.MacOSX.rtf,v 1.5 2002/06/18 23:18:40 massiot Exp $} 
     96$Id: README.MacOSX.rtf,v 1.6 2002/06/19 22:47:14 massiot Exp $} 
  • doc/release-howto.txt

    rf8a2f7c r62e73f5  
    1515     � ipkg/control 
    1616     � debian/changelog 
     17     � extras/MacOSX/vlc.pbprj/project.pbxproj 
    1718  - mettre �our les ChangeLog et la TODO list pour ceux qui auraient 
    1819    �urdiment oubli�e l'updater �haque commit 
  • extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

    rb60815c r62e73f5  
    44        { 
    55            ACTIONS = { 
     6                deinterlace = id;  
    67                eject = id;  
    78                faster = id;  
  • extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

    rd680938 r62e73f5  
    1010        <string>401 417 350 182 0 0 1152 746 </string> 
    1111        <key>29</key> 
    12         <string>809 162 262 44 0 0 1152 746 </string> 
     12        <string>367 465 262 44 0 0 1152 746 </string> 
    1313        <key>445</key> 
    1414        <string>347 561 370 117 0 0 1152 746 </string> 
     
    2020    <key>IBOpenObjects</key> 
    2121    <array> 
     22        <integer>528</integer> 
    2223        <integer>29</integer> 
    23         <integer>528</integer> 
    2424    </array> 
    2525    <key>IBSystem Version</key> 
  • ipkg/control

    rdfac0d1 r62e73f5  
    22Section: graphics 
    33Priority: optional 
    4 Version: 0.5.0-cvs 
     4Version: 0.4.2 
    55Release: 1 
    66Architecture: arm 
  • plugins/macosx/intf_controller.h

    r9b21679 r62e73f5  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001 VideoLAN 
    5  * $Id: intf_controller.h,v 1.10 2002/06/02 12:16:31 massiot Exp $ 
     5 * $Id: intf_controller.h,v 1.11 2002/06/19 22:47:14 massiot Exp $ 
    66 * 
    77 * Authors: Florian G. Pflug <fgp@phlo.org> 
     
    8080- (IBAction)nextChannel:(id)sender; 
    8181- (IBAction)loop:(id)sender; 
     82- (IBAction)deinterlace:(id)sender; 
    8283- (IBAction)mute:(id)sender; 
    8384- (IBAction)fullscreen:(id)fullscreen; 
  • plugins/macosx/intf_controller.m

    rd1adb68 r62e73f5  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001 VideoLAN 
    5  * $Id: intf_controller.m,v 1.9 2002/06/08 19:32:19 sam Exp $ 
     5 * $Id: intf_controller.m,v 1.10 2002/06/19 22:47:14 massiot Exp $ 
    66 * 
    77 * Authors: Florian G. Pflug <fgp@phlo.org> 
     
    192192} 
    193193 
     194- (IBAction)deinterlace:(id)sender 
     195{ 
     196    NSMenuItem * item = (NSMenuItem *)sender; 
     197 
     198    if ( [item state] == NSOnState ) 
     199    { 
     200        config_PutPszVariable( "filter", NULL ); 
     201        [item setState:NSOffState]; 
     202    } 
     203    else 
     204    { 
     205        config_PutPszVariable( "filter", "deinterlace:blend" ); 
     206        [item setState:NSOnState]; 
     207    } 
     208} 
     209 
    194210- (IBAction)mute:(id)sender 
    195211{ 
  • vlc.spec

    rdfac0d1 r62e73f5  
    22 
    33%define name        vlc 
    4 %define vlc_ver     0.5.0-cvs 
     4%define vlc_ver     0.4.2 
    55%define version     %vlc_ver 
    66 
     
    246246# icons 
    247247mkdir -p %{buildroot}/{%{_miconsdir},%{_liconsdir}} 
    248 install -m 644 %buildroot/%_datadir/vlc/vlc16x16.png %buildroot/%{_miconsdir}/vlc.png 
    249 install -m 644 %buildroot/%_datadir/vlc/vlc32x32.png %buildroot/%{_iconsdir}/vlc.png 
    250 install -m 644 %buildroot/%_datadir/vlc/vlc48x48.png %buildroot/%{_liconsdir}/vlc.png 
    251 install -m 644 %buildroot/%_datadir/vlc/gnome-vlc16x16.png %buildroot/%{_miconsdir}/gnome-vlc.png 
    252 install -m 644 %buildroot/%_datadir/vlc/gnome-vlc32x32.png %buildroot/%{_iconsdir}/gnome-vlc.png 
    253 install -m 644 %buildroot/%_datadir/vlc/gnome-vlc48x48.png %buildroot/%{_liconsdir}/gnome-vlc.png 
    254 install -m 644 %buildroot/%_datadir/vlc/gvlc16x16.png %buildroot/%{_miconsdir}/gvlc.png 
    255 install -m 644 %buildroot/%_datadir/vlc/gvlc32x32.png %buildroot/%{_iconsdir}/gvlc.png 
    256 install -m 644 %buildroot/%_datadir/vlc/gvlc48x48.png %buildroot/%{_liconsdir}/gvlc.png 
    257 install -m 644 %buildroot/%_datadir/vlc/kvlc16x16.png %buildroot/%{_miconsdir}/kvlc.png 
    258 install -m 644 %buildroot/%_datadir/vlc/kvlc32x32.png %buildroot/%{_iconsdir}/kvlc.png 
    259 install -m 644 %buildroot/%_datadir/vlc/kvlc48x48.png %buildroot/%{_liconsdir}/kvlc.png 
    260 install -m 644 %buildroot/%_datadir/vlc/qvlc16x16.png %buildroot/%{_miconsdir}/qvlc.png 
    261 install -m 644 %buildroot/%_datadir/vlc/qvlc32x32.png %buildroot/%{_iconsdir}/qvlc.png 
    262 install -m 644 %buildroot/%_datadir/vlc/qvlc48x48.png %buildroot/%{_liconsdir}/qvlc.png 
     248install -m 644 %buildroot/%_datadir/videolan/vlc16x16.png %buildroot/%{_miconsdir}/vlc.png 
     249install -m 644 %buildroot/%_datadir/videolan/vlc32x32.png %buildroot/%{_iconsdir}/vlc.png 
     250install -m 644 %buildroot/%_datadir/videolan/vlc48x48.png %buildroot/%{_liconsdir}/vlc.png 
     251install -m 644 %buildroot/%_datadir/videolan/gnome-vlc16x16.png %buildroot/%{_miconsdir}/gnome-vlc.png 
     252install -m 644 %buildroot/%_datadir/videolan/gnome-vlc32x32.png %buildroot/%{_iconsdir}/gnome-vlc.png 
     253install -m 644 %buildroot/%_datadir/videolan/gnome-vlc48x48.png %buildroot/%{_liconsdir}/gnome-vlc.png 
     254install -m 644 %buildroot/%_datadir/videolan/gvlc16x16.png %buildroot/%{_miconsdir}/gvlc.png 
     255install -m 644 %buildroot/%_datadir/videolan/gvlc32x32.png %buildroot/%{_iconsdir}/gvlc.png 
     256install -m 644 %buildroot/%_datadir/videolan/gvlc48x48.png %buildroot/%{_liconsdir}/gvlc.png 
     257install -m 644 %buildroot/%_datadir/videolan/kvlc16x16.png %buildroot/%{_miconsdir}/kvlc.png 
     258install -m 644 %buildroot/%_datadir/videolan/kvlc32x32.png %buildroot/%{_iconsdir}/kvlc.png 
     259install -m 644 %buildroot/%_datadir/videolan/kvlc48x48.png %buildroot/%{_liconsdir}/kvlc.png 
     260install -m 644 %buildroot/%_datadir/videolan/qvlc16x16.png %buildroot/%{_miconsdir}/qvlc.png 
     261install -m 644 %buildroot/%_datadir/videolan/qvlc32x32.png %buildroot/%{_iconsdir}/qvlc.png 
     262install -m 644 %buildroot/%_datadir/videolan/qvlc48x48.png %buildroot/%{_liconsdir}/qvlc.png 
    263263 
    264264%post 
     
    275275%{_bindir}/vlc 
    276276 
    277 %dir %{_libdir}/vlc 
    278 %{_libdir}/vlc/ac3_spdif.so 
    279 %{_libdir}/vlc/avi.so 
    280 %{_libdir}/vlc/dsp.so 
    281 %{_libdir}/vlc/dummy.so 
    282 %{_libdir}/vlc/dvd.so 
    283 %{_libdir}/vlc/fb.so 
    284 %{_libdir}/vlc/file.so 
    285 %{_libdir}/vlc/filter_clone.so 
    286 %{_libdir}/vlc/filter_crop.so 
    287 %{_libdir}/vlc/filter_deinterlace.so 
    288 %{_libdir}/vlc/filter_distort.so 
    289 %{_libdir}/vlc/filter_invert.so 
    290 %{_libdir}/vlc/filter_transform.so 
    291 %{_libdir}/vlc/filter_wall.so 
    292 %{_libdir}/vlc/fx_scope.so 
    293 %{_libdir}/vlc/http.so 
    294 %{_libdir}/vlc/ipv4.so 
    295 %{_libdir}/vlc/ipv6.so 
    296 %{_libdir}/vlc/logger.so 
    297 %{_libdir}/vlc/lpcm_adec.so 
    298 %{_libdir}/vlc/memcpy.so 
    299 %{_libdir}/vlc/mga.so 
    300 %{_libdir}/vlc/mpeg_es.so 
    301 %{_libdir}/vlc/mpeg_ps.so 
    302 %{_libdir}/vlc/mpeg_ts.so 
    303 %{_libdir}/vlc/null.so 
    304 %{_libdir}/vlc/rc.so 
    305 %{_libdir}/vlc/spudec.so 
    306 %{_libdir}/vlc/udp.so 
    307 %{_libdir}/vlc/vcd.so 
    308 %{_libdir}/vlc/x11.so 
    309 #%{_libdir}/vlc/xmga.so 
     277%dir %{_libdir}/videolan/vlc 
     278%{_libdir}/videolan/vlc/ac3_spdif.so 
     279%{_libdir}/videolan/vlc/avi.so 
     280%{_libdir}/videolan/vlc/dsp.so 
     281%{_libdir}/videolan/vlc/dummy.so 
     282%{_libdir}/videolan/vlc/dvd.so 
     283%{_libdir}/videolan/vlc/fb.so 
     284%{_libdir}/videolan/vlc/file.so 
     285%{_libdir}/videolan/vlc/filter_deinterlace.so 
     286%{_libdir}/videolan/vlc/filter_distort.so 
     287%{_libdir}/videolan/vlc/filter_invert.so 
     288%{_libdir}/videolan/vlc/filter_transform.so 
     289%{_libdir}/videolan/vlc/filter_wall.so 
     290%{_libdir}/videolan/vlc/filter_clone.so 
     291%{_libdir}/videolan/vlc/filter_crop.so 
     292%{_libdir}/videolan/vlc/fx_scope.so 
     293%{_libdir}/videolan/vlc/http.so 
     294%{_libdir}/videolan/vlc/ipv4.so 
     295%{_libdir}/videolan/vlc/ipv6.so 
     296%{_libdir}/videolan/vlc/logger.so 
     297%{_libdir}/videolan/vlc/lpcm_adec.so 
     298%{_libdir}/videolan/vlc/memcpy.so 
     299%{_libdir}/videolan/vlc/mga.so 
     300%{_libdir}/videolan/vlc/mpeg_es.so 
     301%{_libdir}/videolan/vlc/mpeg_ps.so 
     302%{_libdir}/videolan/vlc/mpeg_ts.so 
     303%{_libdir}/videolan/vlc/null.so 
     304%{_libdir}/videolan/vlc/rc.so 
     305%{_libdir}/videolan/vlc/spudec.so 
     306%{_libdir}/videolan/vlc/udp.so 
     307%{_libdir}/videolan/vlc/vcd.so 
     308%{_libdir}/videolan/vlc/x11.so 
     309#%{_libdir}/videolan/vlc/xmga.so 
    310310 
    311311%{_mandir}/man1/* 
     
    320320%defattr(-,root,root) 
    321321%doc README 
    322 %{_libdir}/vlc/gtk.so 
     322%{_libdir}/videolan/vlc/gtk.so 
    323323%{_bindir}/gvlc 
    324324%{_menudir}/vlc-gtk 
     
    334334%defattr(-,root,root) 
    335335%doc README 
    336 %{_libdir}/vlc/gnome.so 
     336%{_libdir}/videolan/vlc/gnome.so 
    337337%{_bindir}/gnome-vlc 
    338338%{_menudir}/vlc-gnome 
     
    349349%defattr(-,root,root) 
    350350%doc README 
    351 %{_libdir}/vlc/qt.so 
     351%{_libdir}/videolan/vlc/qt.so 
    352352%{_bindir}/qvlc 
    353353%{_menudir}/vlc-qt 
     
    364364%defattr(-,root,root) 
    365365%doc README 
    366 %{_libdir}/vlc/ncurses.so 
     366%{_libdir}/videolan/vlc/ncurses.so 
    367367 
    368368%if %plugin_lirc 
     
    370370%defattr(-,root,root) 
    371371%doc README 
    372 %{_libdir}/vlc/lirc.so 
     372%{_libdir}/videolan/vlc/lirc.so 
    373373%endif 
    374374 
     
    377377%defattr(-,root,root) 
    378378%doc README 
    379 %{_libdir}/vlc/sdl.so 
     379%{_libdir}/videolan/vlc/sdl.so 
    380380 
    381381%files ggi 
    382382%defattr(-,root,root) 
    383383%doc README 
    384 %{_libdir}/vlc/ggi.so 
     384%{_libdir}/videolan/vlc/ggi.so 
    385385 
    386386%files aa 
    387387%defattr(-,root,root) 
    388388%doc README 
    389 %{_libdir}/vlc/aa.so 
     389%{_libdir}/videolan/vlc/aa.so 
    390390 
    391391# codec plugin 
     
    393393%defattr(-,root,root) 
    394394%doc README 
    395 %{_libdir}/vlc/mad.so 
     395%{_libdir}/videolan/vlc/mad.so 
    396396 
    397397#audio plugins 
     
    399399%defattr(-,root,root) 
    400400%doc README 
    401 %{_libdir}/vlc/esd.so 
     401%{_libdir}/videolan/vlc/esd.so 
    402402 
    403403%files arts 
    404404%defattr(-,root,root) 
    405405%doc README 
    406 %{_libdir}/vlc/arts.so 
     406%{_libdir}/videolan/vlc/arts.so 
    407407 
    408408%files alsa 
    409409%defattr(-,root,root) 
    410410%doc README 
    411 %{_libdir}/vlc/alsa.so 
     411%{_libdir}/videolan/vlc/alsa.so 
    412412 
    413413%changelog 
     414* Mon Jun 20 2002 Yves Duret <yduret@mandrakesoft.com> 0.4.2-1mdk 
     415- new upstream release 
     416 
     417* Mon Jun 3 2002 Yves Duret <yduret@mandrakesoft.com> 0.4.1-1mdk 
     418- new upstream release 
     419 
    414420* Thu May 23 2002 Yves Duret <yduret@mandrakesoft.com> 0.4.0-1mdk 
    415421- version 0.4.0 with MPEG4 (DivX) support thx ffmpeg.