[vlc-devel] [vlc-commits] vout: win32: drawable: move the code in video_output/win32

[Steve Lhomme]

On 2020-06-13 16:09, KO Myung-Hun wrote:
> Hi/2.
> 
> Steve Lhomme wrote:
>> vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon May 11 10:48:53 2020 +0200| [0b25d87000c2392b5eb6a8373737d8fb505035a9] | committer: Steve Lhomme
>>
>> vout: win32: drawable: move the code in video_output/win32
>>
> 
> Sorry for late, but please split win32-specific codes because drawable
> is used on OS/2, too.

But it's only enabled with
  if HAVE_WIN32
  vout_LTLIBRARIES += libdrawable_plugin.la
  endif

So either OS/2 defines that and the location is correct, or it doesn't 
and then the makefile is incorrect.

>> No functional changes.
>>
>>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0b25d87000c2392b5eb6a8373737d8fb505035a9
>> ---
>>
>>   modules/video_output/Makefile.am            | 2 +-
>>   modules/video_output/{ => win32}/drawable.c | 0
>>   po/POTFILES.in                              | 2 +-
>>   3 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
>> index c82e9a0ed7..120601b0d8 100644
>> --- a/modules/video_output/Makefile.am
>> +++ b/modules/video_output/Makefile.am
>> @@ -220,7 +220,7 @@ vout_LTLIBRARIES += libegl_win32_plugin.la
>>   endif
>>   endif
>>   
>> -libdrawable_plugin_la_SOURCES = video_output/drawable.c
>> +libdrawable_plugin_la_SOURCES = video_output/win32/drawable.c
>>   if HAVE_WIN32
>>   vout_LTLIBRARIES += libdrawable_plugin.la
>>   endif
>> diff --git a/modules/video_output/drawable.c b/modules/video_output/win32/drawable.c
>> similarity index 100%
>> rename from modules/video_output/drawable.c
>> rename to modules/video_output/win32/drawable.c
>> diff --git a/po/POTFILES.in b/po/POTFILES.in
>> index ae2d9379cb..15103fd15d 100644
>> --- a/po/POTFILES.in
>> +++ b/po/POTFILES.in
>> @@ -1207,7 +1207,6 @@ modules/video_output/android/window.c
>>   modules/video_output/caca.c
>>   modules/video_output/caopengllayer.m
>>   modules/video_output/decklink.cpp
>> -modules/video_output/drawable.c
>>   modules/video_output/fb.c
>>   modules/video_output/glx.c
>>   modules/video_output/ios.m
>> @@ -1219,6 +1218,7 @@ modules/video_output/opengl/vout_helper.h
>>   modules/video_output/vulkan/display.c
>>   modules/video_output/win32/direct3d9.c
>>   modules/video_output/win32/direct3d11.c
>> +modules/video_output/win32/drawable.c
>>   modules/video_output/win32/events.c
>>   modules/video_output/win32/glwin32.c
>>   modules/video_output/win32/window.c
>>
>> _______________________________________________
>> vlc-commits mailing list
>> vlc-commits at videolan.org
>> https://mailman.videolan.org/listinfo/vlc-commits
> 
> -- 
> KO Myung-Hun
> 
> Using Mozilla SeaMonkey 2.7.2
> Under OS/2 Warp 4 for Korean with FixPak #15
> In VirtualBox v6.1.10 on Intel Core i7-3615QM 2.30GHz with 8GB RAM
> 
> Korean OS/2 User Community : http://www.os2.kr/
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>