Browse Source

# revisions: 22944,22946,22948

- recorded merge only, Fixes already only enabled these target + freebsd
- merged removing debug comments.

git-svn-id: branches/fixes_2_6@24946 -
marco 12 years ago
parent
commit
dd70204cf4
2 changed files with 8 additions and 14 deletions
  1. 6 4
      packages/libvlc/fpmake.pp
  2. 2 10
      packages/libvlc/src/vlc.pp

+ 6 - 4
packages/libvlc/fpmake.pp

@@ -15,13 +15,15 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='libvlc';
 {$endif ALLPACKAGES}
-    P.Version:='1.0';
+    P.OSes := [win32, win64, linux, freebsd];
+ 
+     P.Version:='1.0';
     P.License := 'LGPL with modification';
     P.HomepageURL := 'www.freepascal.org';
     P.Email := '[email protected]';
     P.Description := 'VLC library (version 2 or higher) interface and component.';
-    T:=P.Targets.AddUnit('src/libvlc.pp');
-    T:=P.Targets.AddUnit('src/vlc.pp');
+    T:=P.Targets.AddUnit('src/libvlc.pp',[linux,win32,win64]);
+    T:=P.Targets.AddUnit('src/vlc.pp',[linux,win32,win64]);
     with T.Dependencies do
       begin
       AddUnit('libvlc');
@@ -30,4 +32,4 @@ begin
     Run;
     end;
 end.
-{$endif}
+{$endif}

+ 2 - 10
packages/libvlc/src/vlc.pp

@@ -1146,7 +1146,6 @@ end;
 procedure TCustomVLCMediaPlayer.HandleVLCEvent(e: Plibvlc_event_t);
 
 begin
-  Writeln('Enter : ',Ord(e^._type));
   FECS.Enter;
   try
     case libvlc_event_e(e^._type) of
@@ -1162,40 +1161,33 @@ begin
       libvlc_MediaPlayerEndReached       : DoOnEOF;
       libvlc_MediaPlayerEncounteredError : DoOnError;
       libvlc_MediaPlayerTimeChanged      : begin
-                                           Writeln('A');
                                            DoOnTimeChanged(e^.media_player_time_changed.new_time);
                                            end;
       libvlc_MediaPlayerPositionChanged  : begin
-                                           Writeln('AA');
                                            DoOnPositionChanged(e^.media_player_position_changed.new_position);
       end;
       libvlc_MediaPlayerSeekableChanged  : begin
-                                           Writeln('AAA');
                                            DoOnSeekableChanged(e^.media_player_seekable_changed.new_seekable<>0);
       end;
       libvlc_MediaPlayerPausableChanged  : begin
-                                           Writeln('AAAA');
                                            DoOnPausableChanged(e^.media_player_pausable_changed.new_pausable<>0) ;
       end;
       libvlc_MediaPlayerTitleChanged     : begin
-                                           Writeln('AAAAA');
                                            DoOnTitleChanged(e^.media_player_title_changed.new_title);
       end;
       libvlc_MediaPlayerSnapshotTaken    : begin
-                                           Writeln('AAAAAA');
                                            DoOnSnapShot(e^.media_player_snapshot_taken.psz_filename);
       end;
       libvlc_MediaPlayerLengthChanged    : begin
-                                           Writeln('AAAAAAA');
                                            DoOnLengthChanged(e^.media_player_length_changed.new_length);
       end;
     else
-      Writeln('Unknown event type ',e^._type);
+      // Not sure what to do here. 
+      // Writeln('Unknown event type ',e^._type);
     end;
   finally
     FECS.Leave;
   end;
-  Writeln('Leave');
 end;
 
 destructor TCustomVLCMediaPlayer.Destroy;