Index: tmp/org.txm.backtomedia.rcp/build.properties
===================================================================
--- tmp/org.txm.backtomedia.rcp/build.properties	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/build.properties	(revision 2421)
@@ -3,12 +3,13 @@
                META-INF/,\
                .,\
                icons/,\
-               vlcj-2.4.1/jna-3.5.2.jar,\
-               vlcj-2.4.1/platform-3.5.2.jar,\
-               vlcj-2.4.1/vlcj-2.4.1.jar,\
+               vlcj-4.1.0/jna-5.2.0.jar,\
+               vlcj-4.1.0/platform-5.2.0.jar,\
+               vlcj-4.1.0/vlcj-4.1.0.jar,\
                opal-0.9.5.2.jar,\
                OSGI-INF/,\
-               OSGI-INF/l10n/bundle.properties
+               OSGI-INF/l10n/bundle.properties,\
+               vlcj-4.1.0/vlcj-natives-4.1.0.jar
 output..=bin/
 source..=src/
 qualifier=svn
Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-4.1.0-sources.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-4.1.0-sources.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/pom.xml
===================================================================
--- tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/pom.xml	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/pom.xml	(revision 2421)
@@ -0,0 +1,317 @@
+<!--
+    vlcj pom.
+
+    Add the following content to your own project pom.xml file:
+
+    <dependencies>
+        <dependency>
+            <groupId>uk.co.caprica</groupId>
+            <artifactId>vlcj</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+    </dependencies> 
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>9</version>
+    </parent>
+
+    <groupId>uk.co.caprica</groupId>
+    <artifactId>vlcj</artifactId>
+    <version>4.1.0</version>
+
+    <name>vlcj</name>
+    <description>Java Framework for the vlc Media Player.</description>
+    <url>http://capricasoftware.co.uk/projects/vlcj</url>
+    <inceptionYear>2009</inceptionYear>
+
+    <packaging>jar</packaging>
+
+    <licenses>
+        <license>
+            <name>GPL v3</name>
+            <url>http://www.gnu.org/licenses/gpl-3.0.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Caprica Software Limited</name>
+        <url>http://www.capricasoftware.co.uk</url>
+    </organization>
+
+    <developers>
+        <developer>
+            <id>mark</id>
+            <name>Mark Lee</name>
+            <email>mark.lee@capricasoftware.co.uk</email>
+            <url>https://github.com/caprica/vlcj</url>
+            <organization>Caprica Software Limited</organization>
+            <organizationUrl>http://www.capricasoftware.co.uk</organizationUrl>
+            <roles>
+                <role>architect</role>
+                <role>developer</role>
+                <role>owner</role>
+            </roles>
+            <timezone>0</timezone>
+        </developer>
+    </developers>
+
+    <issueManagement>
+        <system>Github</system>
+        <url>https://github.com/caprica/vlcj/issues</url>
+    </issueManagement>
+
+    <scm>
+        <connection>scm:git:git@github.com:caprica/vlcj.git</connection>
+        <developerConnection>scm:git:git@github.com:caprica/vlcj.git</developerConnection>
+        <url>git@github.com:caprica/vlcj.git</url>
+    </scm>
+
+    <properties>
+        <vlcjNatives.version>4.1.0</vlcjNatives.version>
+        <vlcjOsxStubs.version>1.0.0</vlcjOsxStubs.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>uk.co.caprica</groupId>
+            <artifactId>vlcj-natives</artifactId>
+            <version>${vlcjNatives.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.co.caprica</groupId>
+            <artifactId>vlcj-osx-stubs</artifactId>
+            <version>${vlcjOsxStubs.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.maven.plugins</groupId>
+                                        <artifactId>maven-enforcer-plugin</artifactId>
+                                        <versionRange>[1.0.0,)</versionRange>
+                                        <goals>
+                                            <goal>enforce</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <encoding>UTF-8</encoding>
+                    <compilerArgument>-Xlint:serial</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions> 
+                    <execution>
+                        <goals> 
+                            <goal>test-jar</goal>
+                        </goals>
+                        <configuration>
+                            <useDefaultManifestFile>false</useDefaultManifestFile>
+                            <archive>
+                                <addMavenDescriptor>false</addMavenDescriptor>
+                                <manifestEntries>
+                                    <Class-Path>${project.artifactId}-${project.version}.jar</Class-Path>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                            <goal>test-jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.0.1</version>
+                <configuration>
+                    <author>true</author>
+                    <charset>UTF-8</charset>
+                    <doctitle>${project.name} ${project.version} API Documentation</doctitle>
+                    <docfilessubdirs>true</docfilessubdirs>
+                    <encoding>UTF-8</encoding>
+                    <footer>(C)2019 Caprica Software Limited</footer>
+                    <show>public</show>
+                    <quiet>true</quiet>
+                    <failOnError>true</failOnError>
+                    <additionalOptions>-html5</additionalOptions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <attach>false</attach>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>user_distribution</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/dist.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeScope>runtime</includeScope>
+                            <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>jdeb</artifactId>
+                <groupId>org.vafer</groupId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jdeb</goal>
+                        </goals>
+                        <configuration>
+                            <verbose>true</verbose>
+                            <dataSet>
+                                <data>
+                                    <src>${project.build.directory}/${project.build.finalName}.jar</src>
+                                    <type>file</type>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>/usr/share/vlcj/lib</prefix>
+                                    </mapper>
+                                </data>
+                                <data>
+                                    <src>${project.build.directory}/dependencies</src>
+                                    <type>directory</type>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>/usr/share/vlcj/lib</prefix>
+                                    </mapper>
+                                </data>
+                                <data>
+                                    <src>README.md</src>
+                                    <type>file</type>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>/usr/share/doc/vlcj</prefix>
+                                    </mapper>
+                                </data>
+                                <data>
+                                    <src>doc/copyright</src>
+                                    <type>file</type>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>/usr/share/doc/vlcj</prefix>
+                                    </mapper>
+                                </data>
+                            </dataSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>.gitignore</exclude>
+                </excludes>
+            </resource>
+        </resources>
+    </build>
+
+</project>

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/pom.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/README.md
===================================================================
--- tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/README.md	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/README.md	(revision 2421)
@@ -0,0 +1,444 @@
+![vlcj](https://github.com/caprica/vlcj/raw/master/etc/vlcj-logo.png "vlcj")
+
+*You are currently looking at the development branch for vlcj-4.0.0, if you are looking for the previous version of vlcj
+you should switch to the [vlcj-3.x branch](https://github.com/caprica/vlcj/tree/vlcj-3.x).* 
+
+vlcj
+====
+
+The vlcj project provides a Java framework to allow an instance of a native [VLC](http://www.videolan.org/vlc "VLC")
+media player to be embedded in a Java application.
+
+You get more than just simple bindings, you also get a higher level framework that hides a lot of the complexities of
+working with LibVLC.
+
+vlcj is primarily developed and therefore extensively tested on Linux - it does also work just fine on Windows and
+OSX, although there may be some limitations on OSX.
+
+Additionally, whilst not supported as one of the main platforms, this version of vlcj has been tested and shown to be
+working on contemporary Raspberry Pi builds.
+
+At least JDK 1.6 is required.
+
+*This version of vlcj requires VLC 3.0.0 as a minimum, no earlier version is supported.*
+
+This is the open source vlcj project page, see also the 'official'
+[home page](http://capricasoftware.co.uk/projects/vlcj "Official vlcj home page at Caprica Software") where you can find
+more information as well as some new simple tutorials.
+
+News
+====
+
+- 5th April, 2019 - vlcj 4.1.0 release, this release brings JNA "direct mapping" which should give a modest performance boost
+- 1st April, 2019 - vlcj 4.0.8 released, fixes an issue with the BufferedImage in the CallbackMediaPlayerComponent
+- 24th March, 2019 - vlcj 4.0.7 released, minor change to allow to change the callback video surface image painter after creation
+- 18th March, 2019 - published a Yeoman generator for vlcj starter projects, see [generator-vlcj](https://github.com/caprica/generator-vlcj)
+- 5th March, 2019 - vlcj 4.0.6 released, fixes issues with image painters when using CallbackMediaPlayerComponent
+- 4th March, 2019 - vlcj 4.0.5 released, fixes a problem using ByteBuffer on Java8
+- 4th March, 2019 - vlcj 4.0.4 released, audio callbacks can now optionally manage audio volume, some minor API changes
+- 1st March, 2019 - vlcj 4.0.3 released, fixes a problem with native discovery directory providers and minor API changes
+- 28th February, 2019 - vlcj 4.0.2 released, resolves a potential deadlock (upgrade to this version strongly recommended)
+- 27th February, 2019 - vlcj 4.0.1 released, primarily fixes a small number of minor public API issues
+- 20th February, 2019 - vlcj 4.0.0 released
+
+All releases are at available at [Maven Central](https://search.maven.org/search?q=a:vlcj).
+
+You can follow @capricasoftware on Twitter for more vlcj news.
+
+vlcj-4
+======
+
+vlcj-4 has a new API, but there is still a lot of similarity with vlcj-3 and under the covers there is still mostly the
+same mature and stable implementation.
+
+The vlcj-4 API is now pretty much stable, although some changes may be made depending on feedback and usage after the
+first release of 4.0.0 is let loose into the wild - but no further *major* API changes are planned or expected.
+
+If you are interested in using vlcj-4, now is a good time to start.
+
+vlcj-4.1
+========
+
+vlcj-4.1 brings JNA "direct mapping" which should give a modest performance boost at the expense of less helpful error
+messages if things go wrong when loading the native LibVLC library.
+
+If you wish to stay with "traditional" JNA bindings, then stick with the latest vlcj-4.0.x.
+
+This direct mapping approach will be used in all future versions of vlcj, meaning vlcj-4.1.x, vlcj-5.x and later.
+
+Major New Features
+------------------
+
+Headline changes:
+
+ - full support for 360 degree video, changing pitch, yaw, roll, field-of-view
+ - full support for discovery and usage of alternate media renderers, e.g. Chromecast
+ - full support for media-slave API to set subtitle tracks and additional/alternate audio tracks
+ - full support for integrated native dialogs, e.g. you can now be prompted for credentials when accessing a protected
+   stream
+ - use any AWT Component as a video surface, not just a Canvas (Window will work on OSX, with limitations)
+ - easy to add support for alternate video surfaces, e.g. an SWT Composite
+ - major changes and improvements to the so-called "direct-rendering" media players, the direct audio and video media
+   players are no longer separate components and are now instead intrinsic to the standard media player. For video, a
+   new "Callback" video surface brings a vastly improved implementation, an optional related component provides a good
+   default implementation for direct-rendering and an easy way to deal with re-sizing of the video, with easy extension
+   points for custom video "painters"
+ - improvements to full-screen support with sensible default implementations provided for Linux, Windows and OSX, all
+   using a native solution to provide the best result
+ - automatic handling of subitems (e.g. when playing a YouTube video or a streaming playlist) is now intrinsic to the
+   media player and requires no involvement of the client application
+ - simplified native library discovery, now intrinsic to the media player factory and it should just work out-of-the-box
+   in the vast majority of cases
+ - API support for multiple logos (in series, not concurrent)
+ - logo and marquee now work without having to explicitly enable the respective native modules
+ - there is now better support for media generally (e.g. using media without a media player, for parsing meta data etc),
+   and also better support for media-lists (e.g. it should now be easier to manage your own play-lists)
+
+There have also been a lot of more general improvements to freshen up the codebase, make it more maintainable for the
+future, and to clear some legacy issues that have dogged the project for quite some time.
+
+For a full list of changes in this release, check the release milestones:
+
+- [vlcj 4.0.0 release milestone](https://github.com/caprica/vlcj/milestone/14?closed=1)
+- [vlcj 4.0.1 release milestone](https://github.com/caprica/vlcj/milestone/32?closed=1)
+- [vlcj 4.0.2 release milestone](https://github.com/caprica/vlcj/milestone/33?closed=1)
+- [vlcj 4.0.3 release milestone](https://github.com/caprica/vlcj/milestone/34?closed=1)
+- [vlcj 4.0.4 release milestone](https://github.com/caprica/vlcj/milestone/35?closed=1)
+- [vlcj 4.0.5 release milestone](https://github.com/caprica/vlcj/milestone/36?closed=1)
+- [vlcj 4.0.6 release milestone](https://github.com/caprica/vlcj/milestone/37?closed=1)
+- [vlcj 4.0.7 release milestone](https://github.com/caprica/vlcj/milestone/38?closed=1)
+- [vlcj 4.0.8 release milestone](https://github.com/caprica/vlcj/milestone/40?closed=1)
+
+vlcj 4.1.0+ uses JNA direct-mapping:
+
+- [vlcj 4.1.0 release milestone](https://github.com/caprica/vlcj/milestone/39?closed=1)
+
+Despite all of these changes, running on JDK 1.6 is still supported!
+
+Known Issues
+------------
+
+ - `CallbackMediaPlayerComponent` does not properly render media that does not have a sample-aspect-ratio (SAR) 1:1,
+   this mostly affects DVD ISO, you can still provide your own implementation that handles other SAR's if you need to.
+   In any case, using the callback media player with DVD ISO is somewhat of a niche combination and for the vast
+   majority of media types this will not be an issue. This may be improved in a later release. The fundamental problem
+   right now is that there is simply no *reliable* way to know the SAR - SAR does appear eventually in track information
+   but there is no concrete link between that SAR track information and the currently playing video track. This is an
+   issue in the underlying native library.
+
+ - When using the new alternate renderer API, if you attempt to play another media while a media is already being sent
+   to something like Chromecast you may experience problems - even if you stop the current media first. The cause of
+   this is currently unknown, but it may be a native issue.
+
+API Breakage (vlcj-3)
+---------------------
+
+This is the *tenth year* of the project, the API has been pretty much static for that entire time. The codebase has
+evolved gradually and incrementally in that time and resulted sometimes in sub-optimal implementations and choices, as
+well as some generally unwieldy individual classes containing literally thousands of lines of code. Keeping the API
+fixed for those almost ten years also locked in some long-standing architectural issues that simply could not be
+resolved.
+
+The decision to break backwards compatibility with the vlcj-3 API was not taken lightly, but the results have been worth
+it. All legacy architectural issues have been resolved, the giant god-classes have been factored to more manageable
+chunks, and ongoing maintenance will be much easier.
+
+The price for these improvements is some API breakage, sorry.
+
+The short version of the situation is that vlcj-4 can *not* be considered a drop-in upgrade for any vlcj-3 applications.
+If you want to move to vlcj-4 with your existing applications, you *will* be impacted, at best you will need to use new
+names for existing methods, at worst although very unlikely you may have to make some *deep* changes in your own
+codebase. 
+
+There is no automatic migration tool.
+
+The longer version of the situation is documented more fully in
+[this ticket](https://github.com/caprica/vlcj/issues/681). 
+
+Tutorials
+---------
+
+New tutorials for vlcj-4 are available [here](http://capricasoftware.co.uk/projects/vlcj-4/tutorials).
+
+There are simple tests or demo applications available for pretty much every aspect of vlcj functionality, these are
+provided in the
+[project test sources](https://github.com/caprica/vlcj/tree/master/src/test/java/uk/co/caprica/vlcj/test).
+
+There is also a major demo application available at the [vlcj-player](https://github.com/caprica/vlcj-player) project
+page.
+
+Building vlcj - sun.misc.Unsafe
+-------------------------------
+
+Currently the target supported JDK is still 1.6, since there are no new language or platform features used in vlcj
+that need anything past 1.6. There is no particularly strong reason to keep supporting 1.6, but there is no particular
+reason to abandon it either.
+
+On the other hand, the project is at the moment built with OpenJDK 11 on Linux and cross-compiled to 1.6. This will
+work just fine when using Maven to build the project from the command-line, or when working with Eclipse.
+
+However, if you use IntelliJ IDEA you may encounter some compilation problems...
+
+When compiling, IDEA will complain that package sun.misc does not exist - the `Unsafe` class from this package is
+required for the "direct" media players.
+
+This can be worked around in a number of ways:
+
+ - use source and target JDK 1.10 in the pom.xml, which IDEA will then incorporate into the project
+ - use JDK 1.9 and convert the project to use the Java Module System and add jdk.unsupported as a required module
+ - change the IDEA compiler settings to *uncheck* the "Use '--release' option for cross-compilation (Java 9 and later)"
+
+The latter option is probably the simplest to deal with.
+
+When compiling with Maven it is simply not possible to suppress the warnings about using sun.misc.Unsafe.
+
+Maven Dependency
+----------------
+
+Add the following Maven dependency to your own project pom.xml:
+
+```
+<dependency>
+    <groupId>uk.co.caprica</groupId>
+    <artifactId>vlcj</artifactId>
+    <version>4.1.0</version>
+</dependency>
+```
+
+The core vlcj project now no longer contains the required JNA bindings to LibVLC, these are provided instead by the
+separate [vlcj-natives](https://github.com/caprica/vlcj-natives) project. The vlcj core project therefore has a new
+required dependency on the vlcj-natives project.
+
+If you are using Maven (or similar) to manage your dependencies, the vlcj-natives dependency will be handled
+automatically for you (you only need to explicitly add vlcj to your project, not vlcj-natives).
+
+If you are installing vlcj manually, then you will need to include the new vlcj-natives jar file along with the existing
+vlcj jar file.
+
+Threading Model
+---------------
+
+This section is very important.
+
+With vlcj-4, every native event coming from LibVLC is processed on the native callback thread. This should give some
+small performance gains when compared with vlcj-3.
+
+The critical issue is that it is generally not permitted to call back into LibVLC from the event callback thread. Doing
+so may cause subtle failures or outright hard JVM crashes.
+
+A prime example of the sort of trap waiting for you is the very common case of handling a media player "finished" event
+so that you can then play the next item in a play-list:
+
+```
+mediaPlayer.events().addMediaPlayerEventListener(new MediaPlayerEventAdapter() {
+    @Override
+    public void finished(MediaPlayer mediaPlayer) {
+        mediaPlayer.media().play(nextMrl); // <-- This is VERY BAD INDEED
+    }
+});
+```
+
+In this example, the `finished` method is being invoked on a native callback thread owned by LibVLC. The implementation
+of this method is calling back into LibVLC when it invokes `play`. This is very likely to cause a JVM crash and
+kill your application.
+
+In cases such as this, you should make use of an asynchronous task-executor queue conveniently provided by the 
+`MediaPlayer` object passed to the listener method:
+
+```
+mediaPlayer.events().addMediaPlayerEventListener(new MediaPlayerEventAdapter() {
+    @Override
+    public void finished(final MediaPlayer mediaPlayer) {
+        mediaPlayer.submit(new Runnable() {
+            @Override
+            public void run() {
+                mediaPlayer.media().play(nextMrl);
+            }
+        });
+    }
+});
+```
+
+You should *not* use this mechanism for *all* of your event handlers, *only those that will call back into LibVLC*.
+
+Other high-level vlcj components may also provide their own asynchronous task executor, it is not limited to the media
+player.
+
+An added caveat for vlcj-4 is that when you implement event handling you must be sure to execute quickly, and to not
+block the native thread with any long-running operation.
+
+Your event handler implementations must *not* throw an `Exception`, failure of your event handlers to catch and handle
+any thrown exception may prevent other listeners from being notified of the event.
+
+If you are attempting to use multiple media players in your application, or using media players from multiple threads,
+you may need to take some extra care so that you do not have multiple threads calling into LibVLC concurrently. You may
+encounter subtle bugs and races that are very difficult to diagnose.
+
+In addition, you must take care not to update Swing UI components from the native thread - all Swing UI updates are
+supposed to go via the Swing Event Dispatch Thread (EDT).
+ 
+You can achieve this in the usual way by using `SwingUtilities#invokeLater` in your event handler:
+
+```
+mediaPlayer.events().addMediaPlayerEventListener(new MediaPlayerEventAdapter() {
+    @Override
+    public void finished(MediaPlayer mediaPlayer) {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                // ...change UI state here...
+            }
+        });
+    }
+});
+```
+
+Garbage Collection
+------------------
+
+This section is also very important.
+
+Ordinarily when developing with Java you will be used to not thinking about the scope and life-cycle of the objects that
+you create, instead you will rely on the garbage collector in the Java Virtual Machine to just take of things for you.
+
+With vlcj's `MediaPlayerFactory`, `MediaPlayer`, and associated classes, you must take care to prevent those objects
+from being garbage collected - if you do not, at best your media player will simply unexpectedly stop working and at
+worst you may see a fatal JVM crash.
+
+Those vlcj objects wrap a native resource (e.g. a native media player). Those media player resources know nothing about
+any JVM. So just because a native media player is still "alive" it will not prevent your object instance from being
+garbage collected. If your object instance does get garbage collected, the native resource still has no idea, and will
+will keeping sending native events back to the JVM via a callback. If your object is gone, that native callback has
+nowhere to go and will most likely crash your JVM.
+
+A very common mistake is to declare vlcj objects on the local heap in some sort of initialisation method:
+
+```
+    private void setup() {
+        MediaPlayerFactory factory = new MediaPlayerFactory();
+        EmbeddedMediaPlayer mediaPlayer = factory.mediaPlayers().newEmbeddedMediaPlayer();
+        // ... other initialisation ...
+    }
+```
+
+When this method returns, the `factory` and `mediaPlayer` objects go out of scope and become eligible for garbage
+collection. The garbage collection may happen immediately, or some time later.
+
+The most common solution is to change those local heap declarations to class fields:
+
+```
+    private MediaPlayerFactory factory;
+
+    private EmbeddedMediaPlayer mediaPlayer;
+
+    private void setup() {
+        factory = new MediaPlayerFactory();
+        mediaPlayer = factory.mediaPlayers().newEmbeddedMediaPlayer();
+        // ... other initialisation ...
+    }
+
+```
+
+This is fine and will work in most cases, but you must still make sure that the enclosing class does not itself get
+garbage collected!
+
+See this [vlcj garbage collection tutorial](http://capricasoftware.co.uk/projects/vlcj-4/tutorials/garbage-collection)
+for more information.
+
+Privacy Considerations
+----------------------
+
+When parsing media, depending on configuration, it may be possible that a remote network access is made for meta data
+and album/cover art. This may unintentionally expose sensitive data regarding the media being parsed.
+
+To affirmatively prevent all network access for meta data, consider using the `--no-metadata-network-access` argument
+when creating a `MediaPlayerFactory`.
+
+It should also be possible to prevent such network accesses by using appropriate `ParseFlag` values when requesting to
+parse media.
+
+Even with network access disabled, some media cover art may still appear locally (e.g. ~/.cache/vlc) - this does not
+necessarily mean that a remote network request was made for the cover art, rather the art that was already embedded in
+the media file was extracted to this temporary cache directory.
+
+In any case, you need to be aware of this issue and inform users of your application about it.
+
+Documentation
+-------------
+
+Tutorials will be made available, not yet, at the
+[official project page](http://capricasoftware.co.uk/projects/vlcj/tutorials).
+
+The vlcj project page is at [github](http://caprica.github.com/vlcj "vlcj at github").
+
+Online Javadoc is available here:
+
+JNA direct-mapping:
+
+* [4.1.0 (current)](http://caprica.github.com/vlcj/javadoc/4.1.0/index.html "4.1.0 Javadoc")
+
+JNA traditional mapping:
+
+* [4.0.8 (current)](http://caprica.github.com/vlcj/javadoc/4.0.8/index.html "4.0.8 Javadoc")
+* [4.0.7](http://caprica.github.com/vlcj/javadoc/4.0.7/index.html "4.0.7 Javadoc")
+* [4.0.6](http://caprica.github.com/vlcj/javadoc/4.0.6/index.html "4.0.6 Javadoc")
+* [4.0.5](http://caprica.github.com/vlcj/javadoc/4.0.5/index.html "4.0.5 Javadoc")
+* [4.0.4](http://caprica.github.com/vlcj/javadoc/4.0.4/index.html "4.0.4 Javadoc")
+* [4.0.3](http://caprica.github.com/vlcj/javadoc/4.0.3/index.html "4.0.3 Javadoc")
+* [4.0.2](http://caprica.github.com/vlcj/javadoc/4.0.2/index.html "4.0.2 Javadoc")
+* [4.0.1](http://caprica.github.com/vlcj/javadoc/4.0.1/index.html "4.0.1 Javadoc")
+* [4.0.0](http://caprica.github.com/vlcj/javadoc/4.0.0/index.html "4.0.0 Javadoc")
+
+Examples
+--------
+
+There are many examples in the vlcj test sources showing how to use vlcj.
+
+For a more complete example of a feature-rich media player built with vlcj,
+see [vlcj-player](https://github.com/caprica/vlcj-player).
+
+Related Projects
+----------------
+
+ * [vlcj-natives](https://github.com/caprica/vlcj-natives)
+ * [vlcj-player](https://github.com/caprica/vlcj-player)
+ * [vlcj-javafx](https://github.com/caprica/vlcj-javafx)
+ * [vlcj-mrls](https://github.com/caprica/vlcj-mrls)
+ * [vlcj-file-filters](https://github.com/caprica/vlcj-file-filters)
+ * [vlcj-swt](https://github.com/caprica/vlcj-swt)
+ * [vlcj-swt-demo](https://github.com/caprica/vlcj-swt-demo)
+ * [vlcj-swt-swing](https://github.com/caprica/vlcj-swt-swing)
+ * [vlcj-info](https://github.com/caprica/vlcj-info)
+ * [vlcj-radio-demo](https://github.com/caprica/vlcj-radio-demo)
+ * [generator-vlcj](https://github.com/caprica/generator-vlcj)
+
+Support
+-------
+
+Development of vlcj is carried out by [Caprica Software](http://www.capricasoftware.co.uk).
+
+Free support for Open Source and non-commercial projects is generally provided - you can
+use [github issues](https://github.com/caprica/vlcj/issues "vlcj github issues") for this purpose.
+
+Support for commercial projects is provided exclusively on commercial terms - send an email to the following address for
+more information:
+
+> mark [dot] lee [at] capricasoftware [dot] co [dot] uk
+
+License
+-------
+
+The vlcj framework is provided under the GPL, version 3 or later.
+
+If you want to consider a commercial license for vlcj that allows you to use and redistribute vlcj without complying
+with the GPL then send an email to the address below:
+
+> mark [dot] lee [at] capricasoftware [dot] co [dot] uk
+
+Contributors
+------------
+
+Contributions are welcome and will always be licensed according to the Open Source license terms of the project (currently GPL).
+
+However, for a contribution to be accepted you must agree to transfer any copyright so that your contribution does not
+impede our ability to provide commercial licenses for vlcj.
Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-4.1.0-javadoc.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-4.1.0-javadoc.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-natives-4.1.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-natives-4.1.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/jna-5.2.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/jna-5.2.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/README.LICENSE
===================================================================
--- tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/README.LICENSE	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/README.LICENSE	(revision 2421)
@@ -0,0 +1,16 @@
+VLCJ 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 3 of the License, or
+(at your option) any later version.
+
+VLCJ 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 VLCJ.  If not, see <http://www.gnu.org/licenses/>.
+ 
+Copyright 2009-2019 Caprica Software Limited.
+
+VLCJ makes use of JNA (https://jna.dev.java.net/). JNA is licensed under LGPL.
Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/gpl.txt
===================================================================
--- tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/gpl.txt	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/gpl.txt	(revision 2421)
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  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.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  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.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+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.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     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
+state 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program 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, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU 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.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/gpl.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/README.icons
===================================================================
--- tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/README.icons	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/README.icons	(revision 2421)
@@ -0,0 +1,11 @@
+The icons for the demo media player application came from here:
+
+http://www.fatcow.com/free-icons/
+
+The license is here:
+
+http://creativecommons.org/licenses/by/3.0/us/
+
+These icons seem to be basically new versions of the Silk icons:
+
+http://www.famfamfam.com/lab/icons/silk/
Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/copyright
===================================================================
--- tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/copyright	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/copyright	(revision 2421)
@@ -0,0 +1,18 @@
+
+Copyright (c) 2009-2019, Caprica Software Limited.
+
+This file is part of VLCJ.
+
+VLCJ 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 3 of the License, or
+(at your option) any later version.
+
+VLCJ 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 VLCJ.  If not, see <http://www.gnu.org/licenses/>.
+
Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/lgpl-3.0.txt
===================================================================
--- tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/lgpl-3.0.txt	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/lgpl-3.0.txt	(revision 2421)
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  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 that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU 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 as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/doc/lgpl-3.0.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/jna-platform-5.2.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/jna-platform-5.2.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-4.1.0-test-sources.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-4.1.0-test-sources.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-4.1.0-tests.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-4.1.0-tests.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-4.1.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.backtomedia.rcp/vlcj-4.1.0/vlcj-4.1.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.backtomedia.rcp/vlcj-2.4.1/vlcj-2.4.1-sources.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.backtomedia.rcp/vlcj-2.4.1/vlcj-2.4.1-javadoc.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.backtomedia.rcp/vlcj-2.4.1/platform-3.5.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.backtomedia.rcp/vlcj-2.4.1/jna-3.5.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.backtomedia.rcp/vlcj-2.4.1/vlcj-2.4.1-test-sources.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.backtomedia.rcp/vlcj-2.4.1/vlcj-2.4.1-tests.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.backtomedia.rcp/vlcj-2.4.1/vlcj-2.4.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.backtomedia.rcp/.classpath
===================================================================
--- tmp/org.txm.backtomedia.rcp/.classpath	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/.classpath	(revision 2421)
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib"
-		path="vlcj-2.4.1/jna-3.5.2.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="vlcj-2.4.1/platform-3.5.2.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="vlcj-2.4.1/vlcj-2.4.1.jar" />
-	<classpathentry kind="lib" path="opal-0.9.5.2.jar" />
-	<classpathentry kind="con"
-		path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-	<classpathentry kind="con"
-		path="org.eclipse.pde.core.requiredPlugins">
+	<classpathentry exported="true" kind="lib" path="opal-0.9.5.2.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
-			<accessrule kind="accessible" pattern="**" />
+			<accessrule kind="accessible" pattern="**"/>
 		</accessrules>
 	</classpathentry>
-	<classpathentry kind="src" path="src" />
-	<classpathentry kind="output" path="bin" />
-</classpath>
\ No newline at end of file
+	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="vlcj-4.1.0/jna-5.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="vlcj-4.1.0/jna-platform-5.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="vlcj-4.1.0/vlcj-4.1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="vlcj-4.1.0/vlcj-natives-4.1.0.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: tmp/org.txm.backtomedia.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.backtomedia.rcp/META-INF/MANIFEST.MF	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/META-INF/MANIFEST.MF	(revision 2421)
@@ -1,12 +1,13 @@
 Manifest-Version: 1.0
-Export-Package: org.txm.backtomedia.commands.function,org.txm.backtome
- dia.editors.input,org.txm.backtomedia.editors.vlcplayer,org.txm.backt
- omedia.preferences
 Bundle-SymbolicName: org.txm.backtomedia.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %Bundle-Name
-Bundle-ClassPath: .,vlcj-2.4.1/jna-3.5.2.jar,vlcj-2.4.1/platform-3.5.2
- .jar,vlcj-2.4.1/vlcj-2.4.1.jar,opal-0.9.5.2.jar
+Bundle-ClassPath: .,
+ vlcj-4.1.0/jna-5.2.0.jar,
+ vlcj-4.1.0/platform-5.2.0.jar,
+ vlcj-4.1.0/vlcj-4.1.0.jar,
+ vlcj-4.1.0/vlcj-natives-4.1.0.jar,
+ opal-0.9.5.2.jar
 Require-Bundle: org.txm.core;bundle-version="0.7.0";visibility:=reexport,
  org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,
  org.eclipse.core.runtime;visibility:=reexport,
@@ -18,4 +19,11 @@
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
+Export-Package: org.txm.backtomedia.commands.function,
+ org.txm.backtomedia.editors.input,
+ org.txm.backtomedia.editors.vlcplayer,
+ org.txm.backtomedia.preferences,
+ uk.co.caprica.vlcj.factory.swt,
+ uk.co.caprica.vlcj.player.embedded.videosurface.swt,
+ vlcplayerrcp
 
Index: tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/player/embedded/videosurface/swt/CompositeVideoSurface.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/player/embedded/videosurface/swt/CompositeVideoSurface.java	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/player/embedded/videosurface/swt/CompositeVideoSurface.java	(revision 2421)
@@ -0,0 +1,52 @@
+/*
+ * This file is part of VLCJ.
+ *
+ * VLCJ 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VLCJ 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 VLCJ.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2009-2019 Caprica Software Limited.
+ */
+
+package uk.co.caprica.vlcj.player.embedded.videosurface.swt;
+
+import org.eclipse.swt.widgets.Composite;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurface;
+import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurfaceAdapter;
+
+/**
+ * Implementation of a video surface component that uses an SWT Composite.
+ */
+public class CompositeVideoSurface extends VideoSurface {
+	
+	/**
+	 *
+	 */
+	private final Composite composite;
+	
+	/**
+	 *
+	 *
+	 * @param composite
+	 * @param videoSurfaceAdapter
+	 */
+	public CompositeVideoSurface(Composite composite, VideoSurfaceAdapter videoSurfaceAdapter) {
+		super(videoSurfaceAdapter);
+		this.composite = composite;
+	}
+	
+	@Override
+	public void attach(MediaPlayer mediaPlayer) {
+		videoSurfaceAdapter.attach(mediaPlayer, composite.embeddedHandle);
+	}
+}

Property changes on: tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/player/embedded/videosurface/swt/CompositeVideoSurface.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/SwtMediaPlayerFactory.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/SwtMediaPlayerFactory.java	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/SwtMediaPlayerFactory.java	(revision 2421)
@@ -0,0 +1,68 @@
+/*
+ * This file is part of VLCJ.
+ *
+ * VLCJ 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VLCJ 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 VLCJ.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2009-2019 Caprica Software Limited.
+ */
+
+package uk.co.caprica.vlcj.factory.swt;
+
+import uk.co.caprica.vlcj.factory.discovery.NativeDiscovery;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+
+import java.util.Collection;
+
+// FIXME should we build an SwtEmbeddedMediaPlayerComponent that extends Composite, similar to how we extend JPanel for SWT?
+
+/**
+ * Extension to the default {@link MediaPlayerFactory} that provides SWT components.
+ */
+public class SwtMediaPlayerFactory extends MediaPlayerFactory {
+	
+	private final SwtApi swtApi;
+	
+	public SwtMediaPlayerFactory(NativeDiscovery discovery, String... libvlcArgs) {
+		super(discovery, libvlcArgs);
+		
+		this.swtApi = new SwtApi(this);
+	}
+	
+	public SwtMediaPlayerFactory(String... libvlcArgs) {
+		this(null, libvlcArgs);
+	}
+	
+	public SwtMediaPlayerFactory(NativeDiscovery discovery, Collection<String> libvlcArgs) {
+		this(discovery, libvlcArgs.toArray(new String[libvlcArgs.size()]));
+	}
+	
+	public SwtMediaPlayerFactory(Collection<String> libvlcArgs) {
+		this(null, libvlcArgs.toArray(new String[libvlcArgs.size()]));
+	}
+	
+	/**
+	 *
+	 *
+	 * @return
+	 */
+	public final SwtApi swt() {
+		return swtApi;
+	}
+	
+	@Override
+	public void onBeforeRelease() {
+		swtApi.release();
+	}
+	
+}

Property changes on: tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/SwtMediaPlayerFactory.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/BaseApi.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/BaseApi.java	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/BaseApi.java	(revision 2421)
@@ -0,0 +1,32 @@
+/*
+ * This file is part of VLCJ.
+ *
+ * VLCJ 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VLCJ 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 VLCJ.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2009-2019 Caprica Software Limited.
+ */
+
+package uk.co.caprica.vlcj.factory.swt;
+
+abstract class BaseApi {
+	
+	protected final SwtMediaPlayerFactory factory;
+	
+	BaseApi(SwtMediaPlayerFactory factory) {
+		this.factory = factory;
+	}
+	
+	protected void release() {}
+	
+}

Property changes on: tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/BaseApi.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/SwtApi.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/SwtApi.java	(revision 0)
+++ tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/SwtApi.java	(revision 2421)
@@ -0,0 +1,50 @@
+/*
+ * This file is part of VLCJ.
+ *
+ * VLCJ 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VLCJ 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 VLCJ.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2009-2019 Caprica Software Limited.
+ */
+
+package uk.co.caprica.vlcj.factory.swt;
+
+import org.eclipse.swt.widgets.Composite;
+import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurfaceAdapters;
+import uk.co.caprica.vlcj.player.embedded.videosurface.swt.CompositeVideoSurface;
+
+/**
+ *
+ */
+public final class SwtApi extends BaseApi {
+	
+	/**
+	 *
+	 *
+	 * @param mediaPlayerFactory
+	 */
+	public SwtApi(SwtMediaPlayerFactory mediaPlayerFactory) {
+		super(mediaPlayerFactory);
+	}
+	
+	/**
+	 *
+	 *
+	 * @param composite
+	 * @return
+	 */
+	public CompositeVideoSurface newCompositeVideoSurface(Composite composite) {
+		return new CompositeVideoSurface(composite, VideoSurfaceAdapters.getVideoSurfaceAdapter());
+	}
+	
+}

Property changes on: tmp/org.txm.backtomedia.rcp/src/uk/co/caprica/vlcj/factory/swt/SwtApi.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/ApplicationActionBarAdvisor.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/ApplicationActionBarAdvisor.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/ApplicationActionBarAdvisor.java	(revision 2421)
@@ -6,15 +6,13 @@
 import org.eclipse.ui.application.IActionBarConfigurer;
 
 public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
-    public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-        super(configurer);
-    }
-
-    protected void makeActions(IWorkbenchWindow window) {
-    }
-
-    protected void fillMenuBar(IMenuManager menuBar) {
-    }
-    
+	
+	public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
+		super(configurer);
+	}
+	
+	protected void makeActions(IWorkbenchWindow window) {}
+	
+	protected void fillMenuBar(IMenuManager menuBar) {}
+	
 }
Index: tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/ApplicationWorkbenchAdvisor.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/ApplicationWorkbenchAdvisor.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/ApplicationWorkbenchAdvisor.java	(revision 2421)
@@ -5,13 +5,13 @@
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
 public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
+	
 	private static final String PERSPECTIVE_ID = "WordCloudRCP.perspective"; //$NON-NLS-1$
-
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new ApplicationWorkbenchWindowAdvisor(configurer);
-    }
-
+	
+	public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
+		return new ApplicationWorkbenchWindowAdvisor(configurer);
+	}
+	
 	public String getInitialWindowPerspectiveId() {
 		return PERSPECTIVE_ID;
 	}
Index: tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/Application.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/Application.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/Application.java	(revision 2421)
@@ -12,8 +12,9 @@
 public class Application implements IApplication {
 	
 	public static String PLUGIN_ID = "org.txm.backtomedia"; //$NON-NLS-1$
-
-	/* (non-Javadoc)
+	
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
 	 */
 	public Object start(IApplicationContext context) throws Exception {
@@ -24,12 +25,14 @@
 				return IApplication.EXIT_RESTART;
 			else
 				return IApplication.EXIT_OK;
-		} finally {
+		}
+		finally {
 			display.dispose();
 		}
 	}
-
-	/* (non-Javadoc)
+	
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.equinox.app.IApplication#stop()
 	 */
 	public void stop() {
@@ -38,6 +41,7 @@
 		final IWorkbench workbench = PlatformUI.getWorkbench();
 		final Display display = workbench.getDisplay();
 		display.syncExec(new Runnable() {
+			
 			public void run() {
 				if (!display.isDisposed())
 					workbench.close();
Index: tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/MessagesMP.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/MessagesMP.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/MessagesMP.java	(revision 2421)
@@ -8,47 +8,84 @@
 	private static final String BUNDLE_NAME = "vlcplayerrcp.messages"; //$NON-NLS-1$
 	
 	public static String BackToMedia_0;
+	
 	public static String BackToMedia_1;
+	
 	public static String BackToMedia_11;
+	
 	public static String BackToMedia_12;
+	
 	public static String BackToMedia_14;
+	
 	public static String BackToMedia_16;
+	
 	public static String BackToMedia_17;
+	
 	public static String BackToMedia_19;
+	
 	public static String BackToMedia_25;
+	
 	public static String BackToMedia_26;
+	
 	public static String BackToMedia_27;
+	
 	public static String BackToMedia_29;
+	
 	public static String BackToMedia_30;
+	
 	public static String BackToMedia_7;
+	
 	public static String BackToMediaPreferencePage_1;
+	
 	public static String BackToMediaPreferencePage_2;
+	
 	public static String BackToMediaPreferencePage_3;
+	
 	public static String BackToMediaPreferencePage_4;
+	
 	public static String BackToMediaPreferencePage_5;
+	
 	public static String BackToMediaPreferencePage_6;
+	
 	public static String BackToMediaPreferencePage_7;
+	
 	public static String cancel;
+	
 	public static String error_native_libs;
+	
 	public static String error_open_media;
+	
 	public static String opening;
+	
 	public static String opening_media;
+	
 	public static String pause;
+	
 	public static String play;
+	
 	public static String playing;
+	
 	public static String rate;
+	
 	public static String repeat;
+	
 	public static String resume;
+	
 	public static String select_file;
+	
 	public static String select_file_title;
+	
 	public static String select_object;
+	
 	public static String stop;
+	
 	public static String time_range;
+	
 	public static String volume;
 	
 	
 	static {
 		Utf8NLS.initializeMessages(BUNDLE_NAME, MessagesMP.class);
 	}
-
+	
 }
Index: tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/ApplicationWorkbenchWindowAdvisor.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/ApplicationWorkbenchWindowAdvisor.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/ApplicationWorkbenchWindowAdvisor.java	(revision 2421)
@@ -7,20 +7,20 @@
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
 public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-    public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        super(configurer);
-    }
-
-    public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer) {
-        return new ApplicationActionBarAdvisor(configurer);
-    }
-    
-    public void preWindowOpen() {
-        IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-        configurer.setInitialSize(new Point(400, 300));
-        configurer.setShowCoolBar(false);
-        configurer.setShowStatusLine(false);
-        configurer.setTitle("Hello RCP"); //$NON-NLS-1$
-    }
+	
+	public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
+		super(configurer);
+	}
+	
+	public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer) {
+		return new ApplicationActionBarAdvisor(configurer);
+	}
+	
+	public void preWindowOpen() {
+		IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
+		configurer.setInitialSize(new Point(400, 300));
+		configurer.setShowCoolBar(false);
+		configurer.setShowStatusLine(false);
+		configurer.setTitle("Hello RCP"); //$NON-NLS-1$
+	}
 }
Index: tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/input/VLCPlayerEditorInput.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/input/VLCPlayerEditorInput.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/input/VLCPlayerEditorInput.java	(revision 2421)
@@ -50,7 +50,7 @@
 	public VLCPlayerEditorInput() {
 		super();
 	}
-
+	
 	/**
 	 * Exists.
 	 *
@@ -61,7 +61,7 @@
 	public boolean exists() {
 		return false;
 	}
-
+	
 	/**
 	 * Gets the image descriptor.
 	 *
@@ -74,7 +74,7 @@
 				Application.PLUGIN_ID,
 				IImageKeys.ACTION_WORDCLOUD);
 	}
-
+	
 	/**
 	 * Gets the name.
 	 *
@@ -85,7 +85,7 @@
 	public String getName() {
 		return "VLCPlayer"; //$NON-NLS-1$
 	}
-
+	
 	/**
 	 * Gets the persistable.
 	 *
@@ -96,7 +96,7 @@
 	public IPersistableElement getPersistable() {
 		return null;
 	}
-
+	
 	/**
 	 * Gets the tool tip text.
 	 *
@@ -107,7 +107,7 @@
 	public String getToolTipText() {
 		return getName();
 	}
-
+	
 	/**
 	 * Gets the adapter.
 	 *
@@ -119,7 +119,7 @@
 	public Object getAdapter(@SuppressWarnings("rawtypes") Class arg0) {
 		return null;
 	}
-
+	
 	/**
 	 * Gets the source.
 	 *
Index: tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/vlcplayer/VLCPlayerEditor.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/vlcplayer/VLCPlayerEditor.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/vlcplayer/VLCPlayerEditor.java	(revision 2421)
@@ -11,19 +11,19 @@
 public class VLCPlayerEditor extends EditorPart {
 	
 	/** The Constant ID. */
-	public static final String ID = VLCPlayerEditor.class.getCanonicalName(); //$NON-NLS-1$
+	public static final String ID = VLCPlayerEditor.class.getCanonicalName(); // $NON-NLS-1$
 	
 	VLCPlayer player;
-
+	
 	@Override
 	public void createPartControl(Composite parent) {
 		player = new VLCPlayer(parent, SWT.NONE);
 	}
-
+	
 	public void init() {
 		
 	}
-
+	
 	@Override
 	public void setFocus() {
 		
@@ -31,25 +31,32 @@
 	
 	@Override
 	public void dispose() {
-		try {if (player != null) player.stop();}
-		catch(Exception e) {e.printStackTrace();}
+		try {
+			if (player != null) player.stop();
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+		}
 		
 		super.dispose();
 	}
-
-	/* (non-Javadoc)
+	
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	@Override
-	public void doSave(IProgressMonitor monitor) { }
-
-	/* (non-Javadoc)
+	public void doSave(IProgressMonitor monitor) {}
+	
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.ui.part.EditorPart#doSaveAs()
 	 */
 	@Override
-	public void doSaveAs() { }
-
-	/* (non-Javadoc)
+	public void doSaveAs() {}
+	
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
 	 */
 	@Override
@@ -57,17 +64,18 @@
 			throws PartInitException {
 		setSite(site);
 		setInput(input);
-		//VLCPlayerEditorInput ii = (VLCPlayerEditorInput) input;
+		// VLCPlayerEditorInput ii = (VLCPlayerEditorInput) input;
 	}
-
-	/* (non-Javadoc)
+	
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
 	 */
 	@Override
 	public boolean isSaveAsAllowed() {
 		return false;
 	}
-
+	
 	public VLCPlayer getPlayer() {
 		return player;
 	}
@@ -75,17 +83,18 @@
 	public void setPartName(String partName) {
 		super.setPartName(partName);
 	}
-
+	
 	@Override
 	public boolean isDirty() {
 		return false;
 	}
-
+	
 	/**
 	 * for more test use "player.getEmbeddedMediaPlayer()"
+	 * 
 	 * @return false if the media could not be loaded (file not found, access error...)
 	 */
 	public boolean isMediaLoaded() {
-		return player.getEmbeddedMediaPlayer().isPlayable();
+		return player.getEmbeddedMediaPlayer().status().isPlayable();
 	}
-}
\ No newline at end of file
+}
Index: tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/vlcplayer/VLCPlayer.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/vlcplayer/VLCPlayer.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/vlcplayer/VLCPlayer.java	(revision 2421)
@@ -1,14 +1,10 @@
 package org.txm.backtomedia.editors.vlcplayer;
 
-import java.awt.Canvas;
-import java.awt.Frame;
 import java.io.File;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.awt.SWT_AWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
@@ -22,172 +18,185 @@
 import org.txm.backtomedia.preferences.BackToMediaPreferences;
 import org.txm.utils.logger.Log;
 
-import uk.co.caprica.vlcj.discovery.NativeDiscovery;
-import uk.co.caprica.vlcj.discovery.linux.DefaultLinuxNativeDiscoveryStrategy;
-import uk.co.caprica.vlcj.discovery.mac.DefaultMacNativeDiscoveryStrategy;
-import uk.co.caprica.vlcj.discovery.windows.DefaultWindowsNativeDiscoveryStrategy;
-import uk.co.caprica.vlcj.player.MediaPlayer;
-import uk.co.caprica.vlcj.player.MediaPlayerEventAdapter;
-import uk.co.caprica.vlcj.player.MediaPlayerFactory;
+import uk.co.caprica.vlcj.factory.swt.SwtMediaPlayerFactory;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventAdapter;
+import uk.co.caprica.vlcj.player.component.EmbeddedMediaPlayerComponent;
 import uk.co.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
-import uk.co.caprica.vlcj.player.embedded.videosurface.CanvasVideoSurface;
-import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurfaceAdapter;
-import uk.co.caprica.vlcj.player.embedded.videosurface.linux.LinuxVideoSurfaceAdapter;
-import uk.co.caprica.vlcj.player.embedded.videosurface.mac.MacVideoSurfaceAdapter;
-import uk.co.caprica.vlcj.player.embedded.videosurface.windows.WindowsVideoSurfaceAdapter;
+import uk.co.caprica.vlcj.player.embedded.videosurface.swt.CompositeVideoSurface;
 import vlcplayerrcp.MessagesMP;
 
 public class VLCPlayer extends Composite {
-	static {
-//		System.setProperty("jna.nosys", "true"); // TODO understand why I need to do this 
-//		NativeDiscovery nd = new NativeDiscovery(new DefaultLinuxNativeDiscoveryStrategy() {
-//			 @Override
-//			    protected void onGetDirectoryNames(List<String> directoryNames) {
-//			        directoryNames.add("/usr/lib");
-//			        directoryNames.add("/usr/local/lib");
-//			        directoryNames.add("/snap/vlc/current/usr/lib");
-//			    }
-//		},
-//	            new DefaultWindowsNativeDiscoveryStrategy(),
-//	            new DefaultMacNativeDiscoveryStrategy()
-//);
-		
-		if (!new NativeDiscovery().discover()) {
-			//System.out.println(MessagesMP.error_native_libs);
-		} else {
-			//System.out.println("VLC native libraries found !");
-		}
-	}
+	
+	// static {
+	//// System.setProperty("jna.nosys", "true"); // TODO understand why I need to do this
+	//// NativeDiscovery nd = new NativeDiscovery(new DefaultLinuxNativeDiscoveryStrategy() {
+	//// @Override
+	//// protected void onGetDirectoryNames(List<String> directoryNames) {
+	//// directoryNames.add("/usr/lib");
+	//// directoryNames.add("/usr/local/lib");
+	//// directoryNames.add("/snap/vlc/current/usr/lib");
+	//// }
+	//// },
+	//// new DefaultWindowsNativeDiscoveryStrategy(),
+	//// new DefaultMacNativeDiscoveryStrategy()
+	//// );
+	//
+	// if (!new NativeDiscovery().discover()) {
+	// //System.out.println(MessagesMP.error_native_libs);
+	// } else {
+	// //System.out.println("VLC native libraries found !");
+	// }
+	// }
 	protected static final String NOMEDIA = ""; //$NON-NLS-1$
-	private MediaPlayerFactory mediaPlayerFactory;
+	
 	private EmbeddedMediaPlayer vlcPlayer;
+	
 	private Composite videoComposite;
-	private CanvasVideoSurface playerCanvas;
+	
+	private CompositeVideoSurface playerCanvas;
+	
 	private Scale rateField;
+	
 	private Label rateValueLabel;
+	
 	private Scale volumeField;
+	
 	private Label volumeValueLabel;
 	
 	private Button playButton;
+	
 	private Button repeatButton;
 	
 	protected String currentlyPlayed = ""; //$NON-NLS-1$
-
-	//private String startTime, endTime;
+	
+	// private String startTime, endTime;
 	private int start, end;
 	
 	protected boolean hasEnded = false;
+	
 	private String previouslyPlayed = ""; //$NON-NLS-1$
+	
 	private boolean repeat = false;
+	
 	protected int volume = 100;
+	
 	private Button stopButton;
+	
 	Label timeLabel;
+	
 	TripleRangeSlider timeRange;
+	
 	boolean firstLengthEvent = true;
-
+	
 	long previous = 0;
+	
 	long time, mins, secs;
-
-
+	
+	private SwtMediaPlayerFactory factory;
+	
+	
 	static {
-		//uncomment to enable VLC logs
-		//Logger.setLevel(Level.TRACE);
+		// uncomment to enable VLC logs
+		// Logger.setLevel(Level.TRACE);
 	}
 	
 	public EmbeddedMediaPlayer getEmbeddedMediaPlayer() {
 		return vlcPlayer;
 	}
-
+	
 	public VLCPlayer(Composite parent, int style) {
 		super(parent, style);
 		this.setLayout(new GridLayout(11, false));
-
+		
 		// THE PLAYER
 		videoComposite = new Composite(this, SWT.EMBEDDED | SWT.NO_BACKGROUND);
-
-		Frame videoFrame = SWT_AWT.new_Frame(videoComposite);
-		Canvas canvas = new Canvas();
-		canvas.setBackground(java.awt.Color.black);
-		videoFrame.add(canvas);
-
-		mediaPlayerFactory = new MediaPlayerFactory();
-
-		vlcPlayer = mediaPlayerFactory.newEmbeddedMediaPlayer(null);
-		videoComposite.setVisible(true);
-
-		VideoSurfaceAdapter vadapter;
-		String OS = System.getProperty("os.name"); //$NON-NLS-1$
-		if (OS.indexOf("Windows") >= 0) { //$NON-NLS-1$
-			vadapter = new WindowsVideoSurfaceAdapter();
-		} else if (OS.indexOf("Mac") >= 0) { //$NON-NLS-1$
-			vadapter = new MacVideoSurfaceAdapter();
-		} else {
-			vadapter = new LinuxVideoSurfaceAdapter();
-		}
-
-		playerCanvas = new CanvasVideoSurface(canvas, vadapter);
-		vlcPlayer.setVideoSurface(playerCanvas);
-		vlcPlayer.setPlaySubItems(true); // for youtube, 2013-12-10: youtube.lua don't work
-
 		GridData gdata = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gdata.horizontalSpan = 11;		
+		gdata.horizontalSpan = 11;
 		videoComposite.setLayoutData(gdata);
-
+		
+		factory = new SwtMediaPlayerFactory();
+		playerCanvas = factory.swt().newCompositeVideoSurface(videoComposite);
+		
+		EmbeddedMediaPlayerComponent e = new EmbeddedMediaPlayerComponent();
+		vlcPlayer = e.mediaPlayer();
+		vlcPlayer.videoSurface().set(playerCanvas);
+		
+		// videoComposite.addDisposeListener(new DisposeListener() {
+		// @Override
+		// public void widgetDisposed(DisposeEvent e) {
+		// vlcPlayer.controls().stop();
+		// vlcPlayer.release();
+		// factory.release();
+		// }
+		// });
+		
 		// THE CONTROL BUTTONS
-		playButton = new Button(this,SWT.PUSH);
+		playButton = new Button(this, SWT.PUSH);
 		GridData playLayoutData = new GridData(SWT.FILL, SWT.CENTER, false, false);
 		playButton.setLayoutData(playLayoutData);
 		playButton.setText(MessagesMP.play);
 		playButton.addSelectionListener(new SelectionListener() {
+			
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				if (currentlyPlayed.length() == 0) {
-					selectMedia();
-					playButton.setText(MessagesMP.pause);
-				} else	if (vlcPlayer.isPlaying()) {
-					vlcPlayer.pause();
-					playButton.setText(MessagesMP.resume);
-				} else if (hasEnded) {
-					replay();
-				} else {
-					vlcPlayer.play();
-					playButton.setText(MessagesMP.pause);
-				}
+				vlcPlayer.submit(new Runnable() {
+					
+					@Override
+					public void run() {
+						if (currentlyPlayed.length() == 0) {
+							selectMedia();
+							playButton.setText(MessagesMP.pause);
+						}
+						else if (vlcPlayer.status().isPlaying()) {
+							vlcPlayer.controls().pause();
+							playButton.setText(MessagesMP.resume);
+						}
+						else if (hasEnded) {
+							replay();
+						}
+						else {
+							vlcPlayer.controls().play();
+							playButton.setText(MessagesMP.pause);
+						}
+					}
+				});
 			}
-
+			
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		});
-
-		//		Button browseButton = new Button(this,SWT.PUSH);
-		//		browseButton.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
-		//		browseButton.setText("Open...");
-		//		browseButton.addSelectionListener(new SelectionListener() {
-		//			@Override
-		//			public void widgetSelected(SelectionEvent e) {
-		//				selectMedia();			
-		//			}
+		
+		// Button browseButton = new Button(this,SWT.PUSH);
+		// browseButton.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
+		// browseButton.setText("Open...");
+		// browseButton.addSelectionListener(new SelectionListener() {
+		// @Override
+		// public void widgetSelected(SelectionEvent e) {
+		// selectMedia();
+		// }
 		//
-		//			@Override
-		//			public void widgetDefaultSelected(SelectionEvent e) {}
-		//		});
-
-		stopButton = new Button(this,SWT.PUSH);
+		// @Override
+		// public void widgetDefaultSelected(SelectionEvent e) {}
+		// });
+		
+		stopButton = new Button(this, SWT.PUSH);
 		stopButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		stopButton.setText(MessagesMP.stop);
 		stopButton.addSelectionListener(new SelectionListener() {
+			
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				stop();
 			}
-
+			
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		});
-
+		
 		timeLabel = new Label(this, SWT.NONE);
 		timeLabel.setText("00:00"); //$NON-NLS-1$
-
+		
 		timeRange = new TripleRangeSlider(this, SWT.None);
 		timeRange.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		timeRange.setToolTipText(MessagesMP.time_range);
@@ -196,57 +205,58 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				TripleRangeSlider.SELECTED_KNOB sk = timeRange.getLastSelectedKnob();
-				switch(sk) {
-				case UPPER:
-					end = timeRange.getUpperValue();
-					
-					if (end < time) {
-						//System.out.println("Upper changed: fix time");
-						time = end;
-						vlcPlayer.setTime(time);
-					}
-					break;
-				case LOWER:
-					start = timeRange.getLowerValue();
-					if (start > time) {
-						//System.out.println("Lower changed: fix time");
-						time = start;
-						vlcPlayer.setTime(time);
-					}
-					break;
-				case MIDDLE:
-					
-					time = timeRange.getMiddleValue();
-					//System.out.println("Middle changed: fix time: "+time);
-					vlcPlayer.setTime(time);
-					break;
-				default:
-					// nothing
+				switch (sk) {
+					case UPPER:
+						end = timeRange.getUpperValue();
+						
+						if (end < time) {
+							// System.out.println("Upper changed: fix time");
+							time = end;
+							vlcPlayer.controls().setTime(time);
+						}
+						break;
+					case LOWER:
+						start = timeRange.getLowerValue();
+						if (start > time) {
+							// System.out.println("Lower changed: fix time");
+							time = start;
+							vlcPlayer.controls().setTime(time);
+						}
+						break;
+					case MIDDLE:
+						
+						time = timeRange.getMiddleValue();
+						// System.out.println("Middle changed: fix time: "+time);
+						vlcPlayer.controls().setTime(time);
+						break;
+					default:
+						// nothing
 				}
-				//System.out.println("time range: "+start+" -> "+end+" time="+time);
+				// System.out.println("time range: "+start+" -> "+end+" time="+time);
 			}
 			
 			@Override
-			public void widgetDefaultSelected(SelectionEvent e) { }
+			public void widgetDefaultSelected(SelectionEvent e) {}
 		});
-
-		repeatButton = new Button(this,SWT.CHECK);
+		
+		repeatButton = new Button(this, SWT.CHECK);
 		repeatButton.setText(MessagesMP.repeat);
 		repeat = BackToMediaPreferences.getInstance().getBoolean(BackToMediaPreferences.REPEAT);
 		repeatButton.setSelection(repeat);
 		repeatButton.addSelectionListener(new SelectionListener() {
+			
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				repeat = repeatButton.getSelection();
 			}
-
+			
 			@Override
-			public void widgetDefaultSelected(SelectionEvent e) { }
+			public void widgetDefaultSelected(SelectionEvent e) {}
 		});
-
+		
 		Label l = new Label(this, SWT.NONE);
 		l.setText(MessagesMP.rate);
-
+		
 		rateField = new Scale(this, SWT.BORDER);
 		GridData gdata4 = new GridData(SWT.FILL, SWT.CENTER, false, false);
 		gdata4.widthHint = 100;
@@ -255,25 +265,26 @@
 		rateField.setMinimum(70);
 		rateField.setSelection(100);
 		rateField.setPageIncrement(5);
-
+		
 		rateField.addSelectionListener(new SelectionListener() {
+			
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				float rate = rateField.getSelection()/100.0f;
-				vlcPlayer.setRate(rate);
-				rateValueLabel.setText(""+rateField.getSelection()+"%");
+				float rate = rateField.getSelection() / 100.0f;
+				vlcPlayer.controls().setRate(rate);
+				rateValueLabel.setText("" + rateField.getSelection() + "%");
 			}
-
+			
 			@Override
-			public void widgetDefaultSelected(SelectionEvent e) { }
+			public void widgetDefaultSelected(SelectionEvent e) {}
 		});
-
+		
 		rateValueLabel = new Label(this, SWT.NONE);
 		rateValueLabel.setText("100%");//$NON-NLS-1$
 		
 		l = new Label(this, SWT.NONE);
 		l.setText(MessagesMP.volume);
-
+		
 		volumeField = new Scale(this, SWT.BORDER);
 		gdata4 = new GridData(SWT.FILL, SWT.CENTER, false, false);
 		gdata4.widthHint = 100;
@@ -283,124 +294,158 @@
 		volumeField.setSelection(volume);
 		volumeField.setPageIncrement(5);
 		volumeField.addSelectionListener(new SelectionListener() {
+			
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				vlcPlayer.setVolume(volumeField.getSelection());
+				vlcPlayer.audio().setVolume(volumeField.getSelection());
 				volume = volumeField.getSelection();
-				volumeValueLabel.setText(""+volume+"%");
+				volumeValueLabel.setText("" + volume + "%");
 			}
-
+			
 			@Override
-			public void widgetDefaultSelected(SelectionEvent e) { }
+			public void widgetDefaultSelected(SelectionEvent e) {}
 		});
 		
 		volumeValueLabel = new Label(this, SWT.NONE);
 		volumeValueLabel.setText("100%");
-
-		vlcPlayer.addMediaPlayerEventListener(new MediaPlayerEventAdapter() {			
+		
+		vlcPlayer.events().addMediaPlayerEventListener(new MediaPlayerEventAdapter() {
+			
 			@Override
 			public void playing(MediaPlayer mediaPlayer) {
-				if (volumeField != null) {
-					vlcPlayer.setVolume(volume);
-				}
+				mediaPlayer.submit(new Runnable() {
+					
+					@Override
+					public void run() {
+						if (volumeField != null) {
+							vlcPlayer.audio().setVolume(volume);
+						}
+					}
+				});
 			}
-
+			
 			@Override
 			public void finished(MediaPlayer mediaPlayer) {
-				if (repeat) {
-					replay();
-				} else {
-					hasEnded = true;
-				}
+				mediaPlayer.submit(new Runnable() {
+					
+					@Override
+					public void run() {
+						if (repeat) {
+							replay();
+						}
+						else {
+							hasEnded = true;
+						}
+					}
+				});
+				
 			}
 		});
-
-		vlcPlayer.addMediaPlayerEventListener(new MediaPlayerEventAdapter() {
-
+		
+		vlcPlayer.events().addMediaPlayerEventListener(new MediaPlayerEventAdapter() {
+			
 			@Override
-			public void timeChanged(MediaPlayer arg0, final long arg1) {
-				time = arg1;
-				if (previous == time) {
-					return;
-				}
-				previous = time;
-
-				timeLabel.getDisplay().syncExec(new Runnable() {
+			public void timeChanged(MediaPlayer mediaPlayer, final long arg1) {
+				
+				mediaPlayer.submit(new Runnable() {
+					
 					@Override
 					public void run() {
-						if (timeRange.isDisposed()) {
+						time = arg1;
+						if (previous == time) {
 							return;
 						}
-						if (!timeRange.isDragMiddleKnob()) {
-							timeRange.setMiddleValue((int)time);
-						}
-						updateTimeLabel();
+						previous = time;
 						
-						if (arg1 > end && end != start) {
-							//System.out.println("Time > end :"+arg1 +" > "+end);
-							if (repeat) {
-								vlcPlayer.setTime(start);
-							} else {
-								vlcPlayer.stop();
+						timeLabel.getDisplay().syncExec(new Runnable() {
+							
+							@Override
+							public void run() {
+								if (timeRange.isDisposed()) {
+									return;
+								}
+								if (!timeRange.isDragMiddleKnob()) {
+									timeRange.setMiddleValue((int) time);
+								}
+								updateTimeLabel();
+								
+								if (arg1 > end && end != start) {
+									// System.out.println("Time > end :"+arg1 +" > "+end);
+									if (repeat) {
+										vlcPlayer.controls().setTime(start);
+									}
+									else {
+										vlcPlayer.controls().stop();
+									}
+								}
 							}
-						}
+						});
 					}
 				});
 			}
-
+			
 			@Override
-			public void lengthChanged(MediaPlayer arg0, final long arg1) {
-				if (firstLengthEvent) {
-					firstLengthEvent = false;
+			public void lengthChanged(MediaPlayer mediaPlayer, final long arg1) {
+				
+				mediaPlayer.submit(new Runnable() {
 					
-					//initialize time range widget limits
-					timeRange.getDisplay().syncExec(new Runnable() {
-						@Override
-						public void run() {
-							if (timeRange.isDisposed()) return;
-							timeRange.setMaximum((int)arg1);
-							//if (start == end) end = (int)arg1;
+					@Override
+					public void run() {
+						if (firstLengthEvent) {
+							firstLengthEvent = false;
 							
-							
-							if (end > 0 && start != end) {
-								timeRange.setUpperValue(end);
-							} else {
-								timeRange.setUpperValue((int)arg1);
-							}
-							
-							timeRange.setLowerValue(start);
-							//System.out.println("Range: "+start+" -> "+end+" song length "+arg1);
+							// initialize time range widget limits
+							timeRange.getDisplay().syncExec(new Runnable() {
+								
+								@Override
+								public void run() {
+									if (timeRange.isDisposed()) return;
+									timeRange.setMaximum((int) arg1);
+									// if (start == end) end = (int)arg1;
+									
+									
+									if (end > 0 && start != end) {
+										timeRange.setUpperValue(end);
+									}
+									else {
+										timeRange.setUpperValue((int) arg1);
+									}
+									
+									timeRange.setLowerValue(start);
+									// System.out.println("Range: "+start+" -> "+end+" song length "+arg1);
+								}
+							});
 						}
-					});
-				}
+					}
+				});
 			}
 		});
 	}
-
+	
 	private void updateTimeLabel() {
 		mins = time / 60000;
 		secs = (time / 1000) % 60;
 		timeLabel.setText(String.format("%02d:%02d", mins, secs)); //$NON-NLS-1$
 		timeLabel.update();
 	}
-
+	
 	protected void replay() {
 		if (currentlyPlayed.length() > 0) {
-			//this.play(currentlyPlayed, startTime, endTime);
-			vlcPlayer.setTime(start);
+			// this.play(currentlyPlayed, startTime, endTime);
+			vlcPlayer.controls().setTime(start);
 			playButton.setText(MessagesMP.pause);
 		}
 	}
-
+	
 	protected void selectMedia() {
 		Log.fine(MessagesMP.select_file);
-
+		
 		FileDialog fd = new FileDialog(VLCPlayer.this.getShell(), SWT.OPEN);
 		fd.setText(MessagesMP.select_file_title);
 		File f = new File(previouslyPlayed);
 		if (f.isDirectory()) fd.setFilterPath(f.getPath());
 		else fd.setFilterPath(f.getParent());
-
+		
 		String[] filterExt = { "*.*", "*.mp3", "*.mp4", "*.avi" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 		fd.setFilterExtensions(filterExt);
 		String selected = fd.open();
@@ -408,14 +453,13 @@
 			System.out.println(MessagesMP.cancel);
 			return;
 		}
-
+		
 		currentlyPlayed = selected;
 		previouslyPlayed = selected;
-		Log.fine(MessagesMP.opening+currentlyPlayed);
+		Log.fine(MessagesMP.opening + currentlyPlayed);
 		play(currentlyPlayed, 0, 0);
-
 	}
-
+	
 	/**
 	 * 
 	 * @param mrl
@@ -423,21 +467,22 @@
 	 * @param endtime msec end time
 	 */
 	public void play(String mrl, int time, int endtime) {
-		Log.fine(MessagesMP.bind(MessagesMP.playing, new Object[]{mrl, time, endtime}));
-		play(mrl, ""+time/1000.0f, ""+endtime/1000.0f); //$NON-NLS-1$ //$NON-NLS-2$
+		Log.fine(MessagesMP.bind(MessagesMP.playing, new Object[] { mrl, time, endtime }));
+		play(mrl, "" + time / 1000.0f, "" + endtime / 1000.0f); //$NON-NLS-1$ //$NON-NLS-2$
 	}
-
+	
 	public void play(String mrl, int time) {
 		play(mrl, time, time);
 	}
-
+	
 	public void hideStopButton() {
 		if (this.stopButton != null && !this.stopButton.isDisposed()) {
 			this.stopButton.dispose();
 		}
 	}
-
+	
 	DateTimeFormatter hhmmssFormatter = DateTimeFormatter.ISO_LOCAL_TIME;
+	
 	/**
 	 * 
 	 * @param mrl
@@ -445,47 +490,55 @@
 	 * @param endTime "0.0" or ""hh:mm:ss" format
 	 */
 	public void play(String mrl, String startTime, String endTime) {
-
+		
 		if (startTime.matches("[0-9]+.[0-9]+")) {
-			start = (int)(1000*Float.parseFloat(startTime));
-		} else if (startTime.matches("[0-9]+:[0-9]+:[0-9]+")) {
+			start = (int) (1000 * Float.parseFloat(startTime));
+		}
+		else if (startTime.matches("[0-9]+:[0-9]+:[0-9]+")) {
 			if (startTime.indexOf(":") == 1) {
-				startTime = "0"+startTime;
+				startTime = "0" + startTime;
 			}
 			LocalTime time1 = LocalTime.parse(startTime, hhmmssFormatter);
-			start = 1000*((time1.getHour()*60*60) + (time1.getMinute()*60) + time1.getSecond());
+			start = 1000 * ((time1.getHour() * 60 * 60) + (time1.getMinute() * 60) + time1.getSecond());
 		}
 		
 		if (endTime.matches("[0-9]+.[0-9]+")) {
-			end = (int)(1000*Float.parseFloat(endTime));
-		} else if (endTime.matches("[0-9]+:[0-9]+:[0-9]+")) {
-			if (endTime.indexOf(":") == 1) endTime = "0"+endTime;
+			end = (int) (1000 * Float.parseFloat(endTime));
+		}
+		else if (endTime.matches("[0-9]+:[0-9]+:[0-9]+")) {
+			if (endTime.indexOf(":") == 1) endTime = "0" + endTime;
 			LocalTime time1 = LocalTime.parse(endTime, hhmmssFormatter);
-			end = 1000*((time1.getHour()*60*60) + (time1.getMinute()*60) + time1.getSecond());
+			end = 1000 * ((time1.getHour() * 60 * 60) + (time1.getMinute() * 60) + time1.getSecond());
 		}
 		
-		//if (start == end) end = -1;
+		// if (start == end) end = -1;
 		
-		Log.fine(MessagesMP.bind(MessagesMP.playing, new Object[]{mrl, startTime, endTime}));
-		vlcPlayer.playMedia(mrl);
-		vlcPlayer.setTime(start);
-		if (new File(mrl+".srt").exists()) { //$NON-NLS-1$
-			vlcPlayer.setSubTitleFile(mrl+".srt"); //$NON-NLS-1$
+		Log.fine(MessagesMP.bind(MessagesMP.playing, new Object[] { mrl, startTime, endTime }));
+		// vlcPlayer.submit(new Runnable() {
+		//
+		// @Override
+		// public void run() {
+		vlcPlayer.media().play(mrl);
+		vlcPlayer.controls().setTime(start);
+		if (new File(mrl + ".srt").exists()) { //$NON-NLS-1$
+			vlcPlayer.subpictures().setSubTitleFile(mrl + ".srt"); //$NON-NLS-1$
 		}
 		currentlyPlayed = mrl;
 		previouslyPlayed = mrl;
 		
 		playButton.setText(MessagesMP.pause);
 		firstLengthEvent = true;
+		// }
+		// });
 	}
-
+	
 	public void setRepeat(boolean repeat) {
 		this.repeat = repeat;
 		repeatButton.setSelection(repeat);
 	}
-
+	
 	public void stop() {
-		vlcPlayer.stop();
+		vlcPlayer.controls().stop();
 		currentlyPlayed = NOMEDIA;
 		if (!playButton.isDisposed()) {
 			playButton.setText(MessagesMP.play);
Index: tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/TripleRangeSlider.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/TripleRangeSlider.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/TripleRangeSlider.java	(revision 2421)
@@ -45,32 +45,55 @@
  * </p>
  */
 public class TripleRangeSlider extends Canvas {
-
-	public enum SELECTED_KNOB {NONE, UPPER, LOWER, MIDDLE  };
-
+	
+	public enum SELECTED_KNOB {
+		NONE, UPPER, LOWER, MIDDLE
+	};
+	
 	private int minimum;
+	
 	private int maximum;
+	
 	private int lowerValue;
+	
 	private int middleValue;
+	
 	private int upperValue;
+	
 	private final List<SelectionListener> listeners;
+	
 	private final Image slider, sliderHover, sliderDrag, sliderSelected;
+	
 	private final Image vSlider, vSliderHover, vSliderDrag, vSliderSelected;
+	
 	private int orientation;
+	
 	private int increment;
+	
 	private int pageIncrement;
+	
 	private SELECTED_KNOB lastSelected;
+	
 	private boolean dragInProgress;
+	
 	private Point coordUpper;
+	
 	private boolean upperHover;
+	
 	private Point coordMiddle;
+	
 	private boolean middleHover;
+	
 	private Point coordLower;
+	
 	private boolean lowerHover;
+	
 	private int previousUpperValue;
+	
 	private int previousMiddleValue;
+	
 	private int previousLowerValue;
-
+	
 	/**
 	 * Constructs a new instance of this class given its parent and a style
 	 * value describing its behavior and appearance.
@@ -87,10 +110,12 @@
 	 *            instance (cannot be null)
 	 * @param style the style of control to construct
 	 *
-	 * @exception IllegalArgumentException <ul>
+	 * @exception IllegalArgumentException
+	 *                <ul>
 	 *                <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
 	 *                </ul>
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
 	 *                thread that created the parent</li>
 	 *                </ul>
@@ -109,85 +134,92 @@
 		this.sliderHover = new Image(getDisplay(), this.getClass().getClassLoader().getResourceAsStream("images/slider-hover.png")); //$NON-NLS-1$
 		this.sliderDrag = new Image(getDisplay(), this.getClass().getClassLoader().getResourceAsStream("images/slider-drag.png")); //$NON-NLS-1$
 		this.sliderSelected = new Image(getDisplay(), this.getClass().getClassLoader().getResourceAsStream("images/slider-selected.png")); //$NON-NLS-1$
-
+		
 		this.vSlider = new Image(getDisplay(), this.getClass().getClassLoader().getResourceAsStream("images/h-slider-normal.png")); //$NON-NLS-1$
 		this.vSliderHover = new Image(getDisplay(), this.getClass().getClassLoader().getResourceAsStream("images/h-slider-hover.png")); //$NON-NLS-1$
 		this.vSliderDrag = new Image(getDisplay(), this.getClass().getClassLoader().getResourceAsStream("images/h-slider-drag.png")); //$NON-NLS-1$
 		this.vSliderSelected = new Image(getDisplay(), this.getClass().getClassLoader().getResourceAsStream("images/h-slider-selected.png")); //$NON-NLS-1$
-
+		
 		if ((style & SWT.VERTICAL) == SWT.VERTICAL) {
 			this.orientation = SWT.VERTICAL;
-		} else {
+		}
+		else {
 			this.orientation = SWT.HORIZONTAL;
 		}
-
+		
 		this.addListener(SWT.Dispose, new Listener() {
+			
 			@Override
 			public void handleEvent(final Event event) {
 				SWTGraphicUtil.dispose(TripleRangeSlider.this.slider);
 				SWTGraphicUtil.dispose(TripleRangeSlider.this.sliderHover);
 				SWTGraphicUtil.dispose(TripleRangeSlider.this.sliderDrag);
 				SWTGraphicUtil.dispose(TripleRangeSlider.this.sliderSelected);
-
+				
 				SWTGraphicUtil.dispose(TripleRangeSlider.this.vSlider);
 				SWTGraphicUtil.dispose(TripleRangeSlider.this.vSliderHover);
 				SWTGraphicUtil.dispose(TripleRangeSlider.this.vSliderDrag);
 				SWTGraphicUtil.dispose(TripleRangeSlider.this.vSliderSelected);
 			}
 		});
-
+		
 		addMouseListeners();
 		addListener(SWT.KeyDown, new Listener() {
-
+			
 			@Override
 			public void handleEvent(final Event event) {
 				handleKeyDown(event);
 			}
 		});
 		addPaintListener(new PaintListener() {
+			
 			@Override
 			public void paintControl(final PaintEvent e) {
 				drawWidget(e);
-
+				
 			}
 		});
-
+		
 	}
-
+	
 	/**
 	 * Add the mouse listeners (mouse up, mouse down, mouse move, mouse wheel)
 	 */
 	private void addMouseListeners() {
 		addListener(SWT.MouseDown, new Listener() {
+			
 			@Override
 			public void handleEvent(final Event e) {
 				handleMouseDown(e);
 			}
 		});
-
+		
 		addListener(SWT.MouseUp, new Listener() {
+			
 			@Override
 			public void handleEvent(final Event e) {
 				handleMouseUp(e);
 			}
 		});
-
+		
 		addListener(SWT.MouseMove, new Listener() {
+			
 			@Override
 			public void handleEvent(final Event e) {
 				handleMouseMove(e);
 			}
 		});
-
+		
 		addListener(SWT.MouseWheel, new Listener() {
+			
 			@Override
 			public void handleEvent(final Event e) {
 				handleMouseWheel(e);
 			}
 		});
-
+		
 	}
-
+	
 	/**
 	 * Code executed when the mouse is down
 	 *
@@ -199,24 +231,27 @@
 			this.dragInProgress = true;
 			this.lastSelected = SELECTED_KNOB.UPPER;
 			this.previousUpperValue = this.upperValue;
-		} else if (this.lowerHover) {
+		}
+		else if (this.lowerHover) {
 			this.dragInProgress = true;
 			this.lastSelected = SELECTED_KNOB.LOWER;
 			this.previousLowerValue = this.lowerValue;
-		} else if (this.middleHover) {
+		}
+		else if (this.middleHover) {
 			this.dragInProgress = true;
 			this.lastSelected = SELECTED_KNOB.MIDDLE;
 			this.previousMiddleValue = this.middleValue;
-		} else {
+		}
+		else {
 			this.dragInProgress = true;
-			//this.lastSelected = SELECTED_KNOB.NONE;
+			// this.lastSelected = SELECTED_KNOB.NONE;
 			this.lastSelected = SELECTED_KNOB.MIDDLE;
 			this.previousMiddleValue = this.middleValue;
 			handleMouseMove(e);
 		}
-		//System.out.println("MouseDown : "+lastSelected);
+		// System.out.println("MouseDown : "+lastSelected);
 	}
-
+	
 	/**
 	 * Code executed when the mouse is up
 	 *
@@ -231,16 +266,18 @@
 			if (this.lastSelected == SELECTED_KNOB.UPPER) {
 				this.upperValue = this.previousUpperValue;
 				if (this.middleValue > this.upperValue) this.middleValue = upperValue;
-			} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+			}
+			else if (this.lastSelected == SELECTED_KNOB.LOWER) {
 				this.lowerValue = this.previousLowerValue;
 				if (this.middleValue < this.lowerValue) this.middleValue = lowerValue;
-			} else {
+			}
+			else {
 				this.middleValue = this.previousMiddleValue;
 			}
 			redraw();
 		}
 	}
-
+	
 	/**
 	 * Fire all selection listeners
 	 *
@@ -258,7 +295,7 @@
 		}
 		return true;
 	}
-
+	
 	/**
 	 * Code executed when the mouse pointer is moving
 	 *
@@ -270,39 +307,44 @@
 		this.upperHover = x >= this.coordUpper.x && x <= this.coordUpper.x + img.getBounds().width && y >= this.coordUpper.y && y <= this.coordUpper.y + img.getBounds().height;
 		this.middleHover = x >= this.coordMiddle.x && x <= this.coordMiddle.x + img.getBounds().width && y >= this.coordMiddle.y && y <= this.coordMiddle.y + img.getBounds().height;
 		this.lowerHover = x >= this.coordLower.x && x <= this.coordLower.x + img.getBounds().width && y >= this.coordLower.y && y <= this.coordLower.y + img.getBounds().height;
-
+		
 		if (this.dragInProgress) {
 			if (this.orientation == SWT.HORIZONTAL) {
 				final int mouseValue = (int) ((x - 9f) / computePixelSizeForHorizonalSlider()) + this.minimum;
 				if (this.lastSelected == SELECTED_KNOB.UPPER) {
 					this.upperValue = (int) (Math.ceil(mouseValue / this.increment) * this.increment) - this.increment;
 					checkUpperValue();
-				} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+				}
+				else if (this.lastSelected == SELECTED_KNOB.LOWER) {
 					this.lowerValue = (int) (Math.ceil(mouseValue / this.increment) * this.increment) - this.increment;
 					checkLowerValue();
-				} else {
+				}
+				else {
 					this.middleValue = (int) (Math.ceil(mouseValue / this.increment) * this.increment) - this.increment;
 					checkMiddleValue();
 				}
-
-			} else {
+				
+			}
+			else {
 				final int mouseValue = (int) ((y - 9f) / computePixelSizeForVerticalSlider()) + this.minimum;
 				if (this.lastSelected == SELECTED_KNOB.UPPER) {
 					this.upperValue = (int) (Math.ceil(mouseValue / this.increment) * this.increment) - this.increment;
 					checkUpperValue();
-				} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+				}
+				else if (this.lastSelected == SELECTED_KNOB.LOWER) {
 					this.lowerValue = (int) (Math.ceil(mouseValue / this.increment) * this.increment) - this.increment;
 					checkLowerValue();
-				} else {
+				}
+				else {
 					this.middleValue = (int) (Math.ceil(mouseValue / this.increment) * this.increment) - this.increment;
 					checkMiddleValue();
 				}
 			}
 		}
-
+		
 		redraw();
 	}
-
+	
 	/**
 	 * Code executed when the mouse wheel is activated
 	 *
@@ -312,22 +354,24 @@
 		if (this.lastSelected == SELECTED_KNOB.NONE) {
 			return;
 		}
-
+		
 		if (this.lastSelected == SELECTED_KNOB.LOWER) {
 			this.lowerValue += e.count * this.increment;
 			checkLowerValue();
 			redraw();
-		} else if (this.lastSelected == SELECTED_KNOB.UPPER) {
+		}
+		else if (this.lastSelected == SELECTED_KNOB.UPPER) {
 			this.upperValue += e.count * this.increment;
 			checkUpperValue();
 			redraw();
-		} else {
+		}
+		else {
 			this.middleValue += e.count * this.increment;
 			checkMiddleValue();
 			redraw();
 		}
 	}
-
+	
 	/**
 	 * Check if the lower value is in ranges
 	 */
@@ -354,7 +398,7 @@
 			this.middleValue = this.upperValue;
 		}
 	}
-
+	
 	/**
 	 * Check if the upper value is in ranges
 	 */
@@ -369,7 +413,7 @@
 			this.upperValue = this.lowerValue;
 		}
 	}
-
+	
 	/**
 	 * Draws the widget
 	 *
@@ -384,12 +428,13 @@
 		e.gc.setAntialias(SWT.ON);
 		if (this.orientation == SWT.HORIZONTAL) {
 			drawHorizontalRangeSlider(e.gc);
-		} else {
+		}
+		else {
 			drawVerticalRangeSlider(e.gc);
 		}
-
+		
 	}
-
+	
 	/**
 	 * Draw the range slider (horizontal)
 	 *
@@ -402,7 +447,7 @@
 		this.coordMiddle = drawHorizontalKnob(gc, this.middleValue, SELECTED_KNOB.MIDDLE);
 		this.coordLower = drawHorizontalKnob(gc, this.lowerValue, SELECTED_KNOB.LOWER);
 	}
-
+	
 	/**
 	 * Draw the background
 	 *
@@ -410,36 +455,38 @@
 	 */
 	private void drawBackgroundHorizontal(final GC gc) {
 		final Rectangle clientArea = this.getClientArea();
-
+		
 		gc.setBackground(getBackground());
 		gc.fillRectangle(clientArea);
-
+		
 		if (isEnabled()) {
 			gc.setForeground(getForeground());
-		} else {
+		}
+		else {
 			gc.setForeground(getDisplay().getSystemColor(SWT.COLOR_GRAY));
 		}
 		gc.drawRoundRectangle(9, 9, clientArea.width - 20, clientArea.height - 20, 3, 3);
-
+		
 		final float pixelSize = computePixelSizeForHorizonalSlider();
 		final int startX = (int) (pixelSize * this.lowerValue);
 		final int endX = (int) (pixelSize * this.upperValue);
 		if (isEnabled()) {
 			gc.setBackground(getForeground());
-		} else {
+		}
+		else {
 			gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_GRAY));
 		}
 		gc.fillRectangle(12 + startX, 9, endX - startX - 6, clientArea.height - 20);
-
+		
 	}
-
+	
 	/**
 	 * @return how many pixels corresponds to 1 point of value
 	 */
 	private float computePixelSizeForHorizonalSlider() {
 		return (getClientArea().width - 20f) / (this.maximum - this.minimum);
 	}
-
+	
 	/**
 	 * Draw the bars
 	 *
@@ -449,19 +496,20 @@
 		final Rectangle clientArea = this.getClientArea();
 		if (isEnabled()) {
 			gc.setForeground(getForeground());
-		} else {
+		}
+		else {
 			gc.setForeground(getDisplay().getSystemColor(SWT.COLOR_GRAY));
 		}
-
+		
 		final float pixelSize = computePixelSizeForHorizonalSlider();
 		for (int i = 1; i < 10; i++) {
 			final int x = (int) (9 + pixelSize * (this.maximum - this.minimum) / 10 * i);
 			gc.drawLine(x, 4, x, 7);
 			gc.drawLine(x, clientArea.height - 6, x, clientArea.height - 9);
 		}
-
+		
 	}
-
+	
 	/**
 	 * Draws an horizontal knob
 	 *
@@ -478,38 +526,47 @@
 		if (knob == SELECTED_KNOB.UPPER) {
 			if (this.upperHover) {
 				image = this.dragInProgress ? this.sliderDrag : this.sliderHover;
-			} else if (this.lastSelected == SELECTED_KNOB.UPPER) {
+			}
+			else if (this.lastSelected == SELECTED_KNOB.UPPER) {
 				image = this.sliderSelected;
-			} else {
+			}
+			else {
 				image = this.slider;
 			}
-		} else if (knob == SELECTED_KNOB.LOWER) {
+		}
+		else if (knob == SELECTED_KNOB.LOWER) {
 			if (this.lowerHover) {
 				image = this.dragInProgress ? this.sliderDrag : this.sliderHover;
-			} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+			}
+			else if (this.lastSelected == SELECTED_KNOB.LOWER) {
 				image = this.sliderSelected;
-			} else {
+			}
+			else {
 				image = this.slider;
 			}
-		} else {
+		}
+		else {
 			if (this.middleHover) {
 				image = this.dragInProgress ? this.sliderDrag : this.sliderHover;
-			} else if (this.lastSelected == SELECTED_KNOB.MIDDLE) {
+			}
+			else if (this.lastSelected == SELECTED_KNOB.MIDDLE) {
 				image = this.sliderSelected;
-			} else {
+			}
+			else {
 				image = this.slider;
 			}
 		}
 		if (isEnabled()) {
 			gc.drawImage(image, x + 5, getClientArea().height / 2 - this.slider.getBounds().height / 2);
-		} else {
+		}
+		else {
 			final Image temp = new Image(getDisplay(), image, SWT.IMAGE_DISABLE);
 			gc.drawImage(temp, x + 5, getClientArea().height / 2 - this.slider.getBounds().height / 2);
 			temp.dispose();
 		}
 		return new Point(x + 5, getClientArea().height / 2 - this.slider.getBounds().height / 2);
 	}
-
+	
 	/**
 	 * Draw the range slider (vertical)
 	 *
@@ -522,7 +579,7 @@
 		this.coordMiddle = drawVerticalKnob(gc, this.middleValue, SELECTED_KNOB.MIDDLE);
 		this.coordLower = drawVerticalKnob(gc, this.lowerValue, SELECTED_KNOB.LOWER);
 	}
-
+	
 	/**
 	 * Draws the background
 	 *
@@ -532,33 +589,35 @@
 		final Rectangle clientArea = this.getClientArea();
 		gc.setBackground(getBackground());
 		gc.fillRectangle(clientArea);
-
+		
 		if (isEnabled()) {
 			gc.setForeground(getForeground());
-		} else {
+		}
+		else {
 			gc.setForeground(getDisplay().getSystemColor(SWT.COLOR_GRAY));
 		}
 		gc.drawRoundRectangle(9, 9, clientArea.width - 20, clientArea.height - 20, 3, 3);
-
+		
 		final float pixelSize = computePixelSizeForVerticalSlider();
 		final int startY = (int) (pixelSize * this.lowerValue);
 		final int endY = (int) (pixelSize * this.upperValue);
 		if (isEnabled()) {
 			gc.setBackground(getForeground());
-		} else {
+		}
+		else {
 			gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_GRAY));
 		}
 		gc.fillRectangle(9, 12 + startY, clientArea.width - 20, endY - startY - 6);
-
+		
 	}
-
+	
 	/**
 	 * @return how many pixels corresponds to 1 point of value
 	 */
 	private float computePixelSizeForVerticalSlider() {
 		return (getClientArea().height - 20f) / (this.maximum - this.minimum);
 	}
-
+	
 	/**
 	 * Draws the bars
 	 *
@@ -568,20 +627,21 @@
 		final Rectangle clientArea = this.getClientArea();
 		if (isEnabled()) {
 			gc.setForeground(getForeground());
-		} else {
+		}
+		else {
 			gc.setForeground(getDisplay().getSystemColor(SWT.COLOR_GRAY));
 		}
-
+		
 		final float pixelSize = computePixelSizeForVerticalSlider();
 		for (int i = 1; i < 10; i++) {
 			final int y = (int) (9 + pixelSize * (this.maximum - this.minimum) / 10 * i);
 			gc.drawLine(4, y, 7, y);
 			gc.drawLine(clientArea.width - 6, y, clientArea.width - 9, y);
-
+			
 		}
-
+		
 	}
-
+	
 	/**
 	 * Draws a vertical knob
 	 *
@@ -594,133 +654,156 @@
 	private Point drawVerticalKnob(final GC gc, final int value, final SELECTED_KNOB knob) {
 		final float pixelSize = computePixelSizeForVerticalSlider();
 		final int y = (int) (pixelSize * value);
-
+		
 		Image image;
 		if (knob == SELECTED_KNOB.UPPER) {
 			if (this.upperHover) {
 				image = this.dragInProgress ? this.vSliderDrag : this.vSliderHover;
-			} else if (this.lastSelected == SELECTED_KNOB.UPPER) {
+			}
+			else if (this.lastSelected == SELECTED_KNOB.UPPER) {
 				image = this.vSliderSelected;
-			} else {
+			}
+			else {
 				image = this.vSlider;
 			}
-		} else if (knob == SELECTED_KNOB.LOWER) {
+		}
+		else if (knob == SELECTED_KNOB.LOWER) {
 			if (this.lowerHover) {
 				image = this.dragInProgress ? this.vSliderDrag : this.vSliderHover;
-			} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+			}
+			else if (this.lastSelected == SELECTED_KNOB.LOWER) {
 				image = this.vSliderSelected;
-			} else {
+			}
+			else {
 				image = this.vSlider;
 			}
-		} else { // MIDDLE
+		}
+		else { // MIDDLE
 			if (this.middleHover) {
 				image = this.dragInProgress ? this.vSliderDrag : this.vSliderHover;
-			} else if (this.lastSelected == SELECTED_KNOB.MIDDLE) {
+			}
+			else if (this.lastSelected == SELECTED_KNOB.MIDDLE) {
 				image = this.vSliderSelected;
-			} else {
+			}
+			else {
 				image = this.vSlider;
 			}
 		}
 		if (isEnabled()) {
 			gc.drawImage(image, getClientArea().width / 2 - 8, y + 2);
-		} else {
+		}
+		else {
 			final Image temp = new Image(getDisplay(), image, SWT.IMAGE_DISABLE);
 			gc.drawImage(temp, getClientArea().width / 2 - 8, y + 2);
 			temp.dispose();
 		}
 		return new Point(getClientArea().width / 2 - 8, y + 2);
 	}
-
+	
 	/**
 	 * Code executed when a key is typed
 	 *
 	 * @param event event
 	 */
 	private void handleKeyDown(final Event event) {
-
+		
 		boolean needRedraw = false;
-
+		
 		if (this.lastSelected == SELECTED_KNOB.NONE) {
 			this.lastSelected = SELECTED_KNOB.LOWER;
 		}
-
+		
 		switch (event.keyCode) {
-		case SWT.HOME:
-			if (this.lastSelected == SELECTED_KNOB.UPPER) {
-				this.upperValue = this.minimum;
-			} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
-				this.lowerValue = this.minimum;
-			} else {
-				this.middleValue = this.minimum;
-			}
-			needRedraw = true;
-			break;
-		case SWT.END:
-			if (this.lastSelected == SELECTED_KNOB.UPPER) {
-				this.upperValue = this.maximum;
-			} if (this.lastSelected == SELECTED_KNOB.LOWER) {
-				this.lowerValue = this.maximum;
-			} else {
-				this.middleValue = this.maximum;
-			}
-			needRedraw = true;
-			break;
-		case SWT.PAGE_UP:
-			if (this.lastSelected == SELECTED_KNOB.UPPER) {
-				this.upperValue += this.pageIncrement;
-			} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
-				this.lowerValue += this.pageIncrement;
-			} else {
-				this.middleValue += this.pageIncrement;
-			}
-			needRedraw = true;
-			break;
-		case SWT.PAGE_DOWN:
-			if (this.lastSelected == SELECTED_KNOB.UPPER) {
-				this.upperValue -= this.pageIncrement;
-			} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
-				this.lowerValue -= this.pageIncrement;
-			} else {
-				this.middleValue -= this.pageIncrement;
-			}
-			needRedraw = true;
-			break;
-		case SWT.ARROW_LEFT:
-		case SWT.ARROW_UP:
-			if (this.lastSelected == SELECTED_KNOB.UPPER) {
-				this.upperValue -= this.increment;
-			} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
-				this.lowerValue -= this.increment;
-			} else {
-				this.middleValue -= this.increment;
-			}
-			needRedraw = true;
-			break;
-		case SWT.ARROW_RIGHT:
-		case SWT.ARROW_DOWN:
-			if (this.lastSelected == SELECTED_KNOB.UPPER) {
-				this.upperValue += this.increment;
-			} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
-				this.lowerValue += this.increment;
-			} else {
-				this.middleValue += this.increment;
-			}
-			needRedraw = true;
-			break;
+			case SWT.HOME:
+				if (this.lastSelected == SELECTED_KNOB.UPPER) {
+					this.upperValue = this.minimum;
+				}
+				else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+					this.lowerValue = this.minimum;
+				}
+				else {
+					this.middleValue = this.minimum;
+				}
+				needRedraw = true;
+				break;
+			case SWT.END:
+				if (this.lastSelected == SELECTED_KNOB.UPPER) {
+					this.upperValue = this.maximum;
+				}
+				if (this.lastSelected == SELECTED_KNOB.LOWER) {
+					this.lowerValue = this.maximum;
+				}
+				else {
+					this.middleValue = this.maximum;
+				}
+				needRedraw = true;
+				break;
+			case SWT.PAGE_UP:
+				if (this.lastSelected == SELECTED_KNOB.UPPER) {
+					this.upperValue += this.pageIncrement;
+				}
+				else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+					this.lowerValue += this.pageIncrement;
+				}
+				else {
+					this.middleValue += this.pageIncrement;
+				}
+				needRedraw = true;
+				break;
+			case SWT.PAGE_DOWN:
+				if (this.lastSelected == SELECTED_KNOB.UPPER) {
+					this.upperValue -= this.pageIncrement;
+				}
+				else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+					this.lowerValue -= this.pageIncrement;
+				}
+				else {
+					this.middleValue -= this.pageIncrement;
+				}
+				needRedraw = true;
+				break;
+			case SWT.ARROW_LEFT:
+			case SWT.ARROW_UP:
+				if (this.lastSelected == SELECTED_KNOB.UPPER) {
+					this.upperValue -= this.increment;
+				}
+				else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+					this.lowerValue -= this.increment;
+				}
+				else {
+					this.middleValue -= this.increment;
+				}
+				needRedraw = true;
+				break;
+			case SWT.ARROW_RIGHT:
+			case SWT.ARROW_DOWN:
+				if (this.lastSelected == SELECTED_KNOB.UPPER) {
+					this.upperValue += this.increment;
+				}
+				else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+					this.lowerValue += this.increment;
+				}
+				else {
+					this.middleValue += this.increment;
+				}
+				needRedraw = true;
+				break;
 		}
-
+		
 		if (needRedraw) {
 			if (this.lastSelected == SELECTED_KNOB.UPPER) {
 				checkUpperValue();
-			} else if (this.lastSelected == SELECTED_KNOB.LOWER) {
+			}
+			else if (this.lastSelected == SELECTED_KNOB.LOWER) {
 				checkLowerValue();
-			} else {
+			}
+			else {
 				checkMiddleValue();
 			}
 			redraw();
 		}
 	}
-
+	
 	/**
 	 * Adds the listener to the collection of listeners who will be notified
 	 * when the user changes the receiver's value, by sending it one of the
@@ -732,10 +815,12 @@
 	 *
 	 * @param listener the listener which should be notified
 	 *
-	 * @exception IllegalArgumentException <ul>
+	 * @exception IllegalArgumentException
+	 *                <ul>
 	 *                <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
 	 *                </ul>
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -749,7 +834,7 @@
 		checkWidget();
 		this.listeners.add(listener);
 	}
-
+	
 	/**
 	 * @see org.eclipse.swt.widgets.Composite#computeSize(int, int, boolean)
 	 */
@@ -760,39 +845,45 @@
 		if (this.orientation == SWT.HORIZONTAL) {
 			if (wHint < 100) {
 				width = 100;
-			} else {
+			}
+			else {
 				width = wHint;
 			}
-
+			
 			if (hHint < 30) {
 				height = 30;
-			} else {
+			}
+			else {
 				height = hHint;
 			}
-		} else {
+		}
+		else {
 			if (wHint < 30) {
 				width = 30;
-			} else {
+			}
+			else {
 				width = wHint;
 			}
-
+			
 			if (hHint < 100) {
 				height = 100;
-			} else {
+			}
+			else {
 				height = hHint;
 			}
 		}
-
+		
 		return new Point(width, height);
 	}
-
+	
 	/**
 	 * Returns the amount that the selected receiver's value will be modified by
 	 * when the up/down (or right/left) arrows are pressed.
 	 *
 	 * @return the increment
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -803,13 +894,14 @@
 		checkWidget();
 		return this.increment;
 	}
-
+	
 	/**
 	 * Returns the 'lower selection', which is the lower receiver's position.
 	 *
 	 * @return the selection
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -824,13 +916,14 @@
 	public SELECTED_KNOB getLastSelectedKnob() {
 		return lastSelected;
 	}
-
+	
 	/**
 	 * Returns the 'middle selection', which is the middle receiver's position.
 	 *
 	 * @return the selection
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -847,7 +940,8 @@
 	 *
 	 * @return the maximum
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -858,13 +952,14 @@
 		checkWidget();
 		return this.maximum;
 	}
-
+	
 	/**
 	 * Returns the minimum value which the receiver will allow.
 	 *
 	 * @return the minimum
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -875,14 +970,15 @@
 		checkWidget();
 		return this.minimum;
 	}
-
+	
 	/**
 	 * Returns the amount that the selected receiver's value will be modified by
 	 * when the page increment/decrement areas are selected.
 	 *
 	 * @return the page increment
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -893,14 +989,15 @@
 		checkWidget();
 		return this.pageIncrement;
 	}
-
+	
 	/**
 	 * Returns the 'selection', which is an array where the first element is the
 	 * lower selection, and the second element is the upper selection
 	 *
 	 * @return the selection
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -915,13 +1012,14 @@
 		selection[2] = this.upperValue;
 		return selection;
 	}
-
+	
 	/**
 	 * Returns the 'upper selection', which is the upper receiver's position.
 	 *
 	 * @return the selection
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -932,17 +1030,19 @@
 		checkWidget();
 		return this.upperValue;
 	}
-
+	
 	/**
 	 * Removes the listener from the collection of listeners who will be
 	 * notified when the user changes the receiver's value.
 	 *
 	 * @param listener the listener which should no longer be notified
 	 *
-	 * @exception IllegalArgumentException <ul>
+	 * @exception IllegalArgumentException
+	 *                <ul>
 	 *                <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
 	 *                </ul>
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -956,7 +1056,7 @@
 		checkWidget();
 		this.listeners.remove(listener);
 	}
-
+	
 	/**
 	 * Sets the amount that the selected receiver's value will be modified by
 	 * when the up/down (or right/left) arrows are pressed to the argument,
@@ -964,7 +1064,8 @@
 	 *
 	 * @param increment the new increment (must be greater than zero)
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -976,14 +1077,15 @@
 		this.increment = increment;
 		redraw();
 	}
-
+	
 	/**
 	 * Sets the 'lower selection', which is the receiver's lower value, to the
 	 * argument which must be greater than or equal to zero.
 	 *
 	 * @param value the new selection (must be zero or greater)
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -1000,7 +1102,7 @@
 		
 		redraw();
 	}
-
+	
 	/**
 	 * Sets the maximum value that the receiver will allow. This new value will
 	 * be ignored if it is not greater than the receiver's current minimum
@@ -1010,7 +1112,8 @@
 	 * @param value the new maximum, which must be greater than the current
 	 *            minimum
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -1033,7 +1136,7 @@
 		}
 		redraw();
 	}
-
+	
 	/**
 	 * Sets the minimum value that the receiver will allow. This new value will
 	 * be ignored if it is negative or is not less than the receiver's current
@@ -1044,7 +1147,8 @@
 	 * @param value the new minimum, which must be nonnegative and less than the
 	 *            current maximum
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -1067,7 +1171,7 @@
 		}
 		redraw();
 	}
-
+	
 	/**
 	 * Sets the amount that the receiver's value will be modified by when the
 	 * page increment/decrement areas are selected to the argument, which must
@@ -1075,7 +1179,8 @@
 	 *
 	 * @param pageIncrement the page increment (must be greater than zero)
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -1086,7 +1191,7 @@
 		checkWidget();
 		this.pageIncrement = pageIncrement;
 	}
-
+	
 	/**
 	 * Sets the 'selection', which is the receiver's value, to the argument
 	 * which must be greater than or equal to zero.
@@ -1094,7 +1199,8 @@
 	 * @param value the new selection (first value is lower value, second value
 	 *            is upper value)
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -1103,7 +1209,7 @@
 	 */
 	public void setSelection(final int[] values) {
 		if (values.length != 3) return;
-	
+		
 		checkWidget();
 		setLowerValue(values[0]);
 		setMiddleValue(values[1]);
@@ -1113,7 +1219,7 @@
 		checkMiddleValue();
 		redraw();
 	}
-
+	
 	/**
 	 * Sets the 'selection', which is the receiver's value, argument which must
 	 * be greater than or equal to zero.
@@ -1121,7 +1227,8 @@
 	 * @param lowerValue the new lower selection (must be zero or greater)
 	 * @param upperValue the new upper selection (must be zero or greater)
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -1134,14 +1241,15 @@
 		setMiddleValue(middleValue);
 		setUpperValue(upperValue);
 	}
-
+	
 	/**
 	 * Sets the 'upper selection', which is the upper receiver's value, argument
 	 * which must be greater than or equal to zero.
 	 *
 	 * @param value the new selection (must be zero or greater)
 	 *
-	 * @exception SWTException <ul>
+	 * @exception SWTException
+	 *                <ul>
 	 *                <li>ERROR_WIDGET_DISPOSED - if the receiver has been
 	 *                disposed</li>
 	 *                <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
@@ -1164,8 +1272,8 @@
 			redraw();
 		}
 	}
-
+	
 	public boolean isDragMiddleKnob() {
 		return this.dragInProgress && SELECTED_KNOB.MIDDLE == lastSelected;
 	}
-}
\ No newline at end of file
+}
Index: tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/MediaPreferences.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/MediaPreferences.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/MediaPreferences.java	(revision 2421)
@@ -13,17 +13,17 @@
 import org.txm.objects.CorpusCommandPreferences;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
 
-public class MediaPreferences extends AbstractHandler  {
-
+public class MediaPreferences extends AbstractHandler {
+	
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		
 		ISelection isel = HandlerUtil.getCurrentSelection(event);
 		if (isel instanceof StructuredSelection) {
-			StructuredSelection sel = (StructuredSelection)isel;
+			StructuredSelection sel = (StructuredSelection) isel;
 			Object o = sel.getFirstElement();
 			if (o instanceof MainCorpus) {
-				openPreferences((MainCorpus)o);
+				openPreferences((MainCorpus) o);
 			}
 		}
 		
@@ -45,14 +45,16 @@
 			}
 			try {
 				commandPreferences.getNode().flush();
-			} catch (BackingStoreException e) {
+			}
+			catch (BackingStoreException e) {
 				e.printStackTrace();
 				return false;
 			}
 			
-			System.out.println("Media preferences updated with "+dialog.getProperties());
+			System.out.println("Media preferences updated with " + dialog.getProperties());
 			return true;
-		} else {
+		}
+		else {
 			System.out.println("Canceled.");
 			return false;
 		}
Index: tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/MediaPreferencesDialog.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/MediaPreferencesDialog.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/MediaPreferencesDialog.java	(revision 2421)
@@ -23,21 +23,23 @@
 import org.txm.searchengine.cqp.corpus.MainCorpus;
 
 public class MediaPreferencesDialog extends Dialog {
-
-	public static String[] properties = {BackToMediaPreferences.STRUCTURE_START_PROPERTY, 
-			BackToMediaPreferences.STRUCTURE_END_PROPERTY, 
-			BackToMediaPreferences.STRUCTURE, 
+	
+	public static String[] properties = { BackToMediaPreferences.STRUCTURE_START_PROPERTY,
+			BackToMediaPreferences.STRUCTURE_END_PROPERTY,
+			BackToMediaPreferences.STRUCTURE,
 			BackToMediaPreferences.WORD_PROPERTY,
 			BackToMediaPreferences.WORD_CONTEXT_LEFT_DISTANCE,
 			BackToMediaPreferences.WORD_CONTEXT_RIGHT_DISTANCE,
-			BackToMediaPreferences.SYNCMODE, 
-			BackToMediaPreferences.MEDIA_PATH_PREFIX, 
+			BackToMediaPreferences.SYNCMODE,
+			BackToMediaPreferences.MEDIA_PATH_PREFIX,
 			BackToMediaPreferences.MEDIA_EXTENSION,
 			BackToMediaPreferences.MEDIA_AUTH,
-			BackToMediaPreferences.MEDIA_AUTH_LOGIN};
+			BackToMediaPreferences.MEDIA_AUTH_LOGIN };
 	
 	HashMap<String, Text> fields = new HashMap<String, Text>();
+	
 	HashMap<String, String> values = new HashMap<String, String>();
+	
 	MainCorpus corpus;
 	
 	protected MediaPreferencesDialog(Shell parentShell, MainCorpus corpus) {
@@ -54,27 +56,27 @@
 	}
 	
 	@Override
-    protected Control createDialogArea(Composite parent) {
-        Composite container = (Composite) super.createDialogArea(parent);
-        Composite c = new Composite(container, SWT.NONE);
-        c.setLayout(new GridLayout(3, false));
-        
-        CorpusCommandPreferences commandPreferences = corpus.getProject().getCommandPreferences("backtomedia");//$NON-NLS-1$
-        TXMPreferences alternative = BackToMediaPreferences.getInstance();
-        
-        for (String p : properties) {
-        	new Label(c, SWT.NONE).setText(p);
-        	final Text t = new Text(c, SWT.BORDER);
-        	
-        	GridData gd = new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1);
-        	gd.minimumWidth = 200;
-        	t.setLayoutData(gd);
-        	t.setText(commandPreferences.get(p, alternative));
-        	if (p.contains("directory")) {
-        		t.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 1,1));
-        		Button b = new Button(c,  SWT.PUSH);
-        		b.setText("...");
-        		b.addSelectionListener(new SelectionListener() {
+	protected Control createDialogArea(Composite parent) {
+		Composite container = (Composite) super.createDialogArea(parent);
+		Composite c = new Composite(container, SWT.NONE);
+		c.setLayout(new GridLayout(3, false));
+		
+		CorpusCommandPreferences commandPreferences = corpus.getProject().getCommandPreferences("backtomedia");//$NON-NLS-1$
+		TXMPreferences alternative = BackToMediaPreferences.getInstance();
+		
+		for (String p : properties) {
+			new Label(c, SWT.NONE).setText(p);
+			final Text t = new Text(c, SWT.BORDER);
+			
+			GridData gd = new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1);
+			gd.minimumWidth = 200;
+			t.setLayoutData(gd);
+			t.setText(commandPreferences.get(p, alternative));
+			if (p.contains("directory")) {
+				t.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 1, 1));
+				Button b = new Button(c, SWT.PUSH);
+				b.setText("...");
+				b.addSelectionListener(new SelectionListener() {
 					
 					@Override
 					public void widgetSelected(SelectionEvent e) {
@@ -87,32 +89,32 @@
 					}
 					
 					@Override
-					public void widgetDefaultSelected(SelectionEvent e) { }
+					public void widgetDefaultSelected(SelectionEvent e) {}
 				});
-        	}
-        	fields.put(p, t);
-        }
-        return container;
-    }
-
-    // overriding this methods allows you to set the
-    // title of the custom dialog
-    @Override
-    protected void configureShell(Shell newShell) {
-        super.configureShell(newShell);
-        newShell.setText("Media preferences");
-    }
-
-//    @Override
-//    protected Point getInitialSize() {
-//        return new Point(450, 300);
-//    }
-    
-    @Override
-    protected void okPressed() {
-        for (String p : properties) {
-        	values.put(p, fields.get(p).getText());
-        }
-        super.okPressed();
-    }
+			}
+			fields.put(p, t);
+		}
+		return container;
+	}
+	
+	// overriding this methods allows you to set the
+	// title of the custom dialog
+	@Override
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+		newShell.setText("Media preferences");
+	}
+	
+	// @Override
+	// protected Point getInitialSize() {
+	// return new Point(450, 300);
+	// }
+	
+	@Override
+	protected void okPressed() {
+		for (String p : properties) {
+			values.put(p, fields.get(p).getText());
+		}
+		super.okPressed();
+	}
 }
Index: tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/BackToMedia.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/BackToMedia.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/BackToMedia.java	(revision 2421)
@@ -23,7 +23,7 @@
 // 
 // $LastChangedDate:$
 // $LastChangedRevision:$
-// $LastChangedBy:$ 
+// $LastChangedBy:$ 1
 //
 package org.txm.backtomedia.commands.function;
 
@@ -89,7 +89,7 @@
 	/** The selection. */
 	private IStructuredSelection selection;
 	
-	private static HashMap<IWorkbenchPart, VLCPlayerEditor> associatedEditors = new HashMap<IWorkbenchPart, VLCPlayerEditor>();
+	private static HashMap<IWorkbenchPart, VLCPlayerEditor> associatedEditors = new HashMap<>();
 	
 	/*
 	 * (non-Javadoc)
@@ -123,7 +123,7 @@
 					return backToMedia(cqpCorpus, text_parameter, time_parameter, time_parameter, editor, HandlerUtil.getActiveWorkbenchWindow(event).getShell());
 				}
 				else {
-					return backtoMediaFromWordSelection(cqpCorpus, text_parameter, new String[]{word_parameter, null}, (EditorPart) editor, HandlerUtil.getActiveWorkbenchWindow(event).getShell());
+					return backtoMediaFromWordSelection(cqpCorpus, text_parameter, new String[] { word_parameter, null }, editor, HandlerUtil.getActiveWorkbenchWindow(event).getShell());
 				}
 			}
 			catch (Exception e) {
@@ -145,7 +145,9 @@
 			Object s = selection.getFirstElement();
 			
 			// System.out.println("Selected object: "+s);
-			if (!(s instanceof Line)) { return null; }
+			if (!(s instanceof Line)) {
+				return null;
+			}
 			
 			Line line = (Line) s;
 			org.txm.objects.Match m = line.getMatch();
@@ -160,25 +162,27 @@
 				e.printStackTrace();
 				return null;
 			}
-		} else if (page instanceof SynopticEditionEditor) {
-			SynopticEditionEditor editor = (SynopticEditionEditor)page;
+		}
+		else if (page instanceof SynopticEditionEditor) {
+			SynopticEditionEditor editor = (SynopticEditionEditor) page;
 			Text text = editor.getResult();
 			Project project = text.getProject();
 			MainCorpus cqpCorpus = (MainCorpus) project.getCorpusBuild(null, MainCorpus.class);
 			EditionPanel panel = editor.getEditionPanel(0);
 			String[] ids = panel.getWordSelection();
-			//System.out.println("Words: "+Arrays.toString(ids));
+			// System.out.println("Words: "+Arrays.toString(ids));
 			if (ids[1] == null) { // only one word is selected -> using sync_mode preferences
 				try {
-					return backtoMediaFromWordSelection(cqpCorpus, text.getName(), ids, (EditorPart) editor, HandlerUtil.getActiveWorkbenchWindow(event).getShell());
+					return backtoMediaFromWordSelection(cqpCorpus, text.getName(), ids, editor, HandlerUtil.getActiveWorkbenchWindow(event).getShell());
 				}
 				catch (Exception e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
-				}				
-			} else { // play the current word selection
+				}
+			}
+			else { // play the current word selection
 				try {
-					CQLQuery query = new CQLQuery(NLS.bind("[id=\"{0}\" & _.text_id=\"{1}\"]", ids[0]+"|"+ids[ids.length-1], text.getName()));
+					CQLQuery query = new CQLQuery(NLS.bind("[id=\"{0}\" & _.text_id=\"{1}\"]", ids[0] + "|" + ids[ids.length - 1], text.getName()));
 					QueryResult rez = cqpCorpus.query(query, "TMP", false);
 					if (rez.getNMatch() == 2) {
 						Match m = rez.getMatch(0);
@@ -199,8 +203,9 @@
 						String start = m.getValueForProperty(timeProperty);
 						String end = n.getValueForProperty(timeProperty);
 						return backToMedia(cqpCorpus, text.getName(), start, end, editor, HandlerUtil.getActiveWorkbenchWindow(event).getShell());
-					} else {
-						Log.warning(NLS.bind("Fail to find words with ids={0} in text with id={1}.", ids[0]+"|"+ids[ids.length-1], text.getName()));
+					}
+					else {
+						Log.warning(NLS.bind("Fail to find words with ids={0} in text with id={1}.", ids[0] + "|" + ids[ids.length - 1], text.getName()));
 						return null;
 					}
 				}
@@ -209,7 +214,7 @@
 					e.printStackTrace();
 				}
 			}
-		} 
+		}
 		
 		// no suitable parameters or selection or editor
 		return null;
@@ -235,7 +240,7 @@
 		Match m = null;
 		Match n = null;
 		
-		if (wordids[1] != null) {
+		if (wordids[1] == null) {
 			CQLQuery query = new CQLQuery(NLS.bind("[id=\"{0}\" & _.text_id=\"{1}\"]", wordids[0], textid));
 			QueryResult rez = corpus.query(query, "TMP", false);
 			
@@ -246,12 +251,13 @@
 			
 			m = rez.getMatch(0);
 			n = rez.getMatch(0);
-		} else if (wordids[0] != null && wordids[1] != null) {
-			CQLQuery query = new CQLQuery(NLS.bind("[id=\"{0}\" & _.text_id=\"{1}\"]", wordids[0]+"|"+wordids[1], textid));
+		}
+		else if (wordids[0] != null && wordids[1] != null) {
+			CQLQuery query = new CQLQuery(NLS.bind("[id=\"{0}\" & _.text_id=\"{1}\"]", wordids[0] + "|" + wordids[1], textid));
 			QueryResult rez = corpus.query(query, "TMP", false);
 			
 			if (rez.getNMatch() != 2) {
-				Log.warning(NLS.bind("Warning: found more than or no word for id={0} in {1}", wordids[0]+", "+wordids[1], textid));
+				Log.warning(NLS.bind("Warning: found more than or no word for id={0} in {1}", wordids[0] + ", " + wordids[1], textid));
 				return null;
 			}
 			
@@ -262,9 +268,10 @@
 		if (m == null || n == null) {
 			Log.warning(NLS.bind("Fail to find word with id={0} in text with id={1}", Arrays.toString(wordids), textid));
 			return null;
-		} else {
-			return backtoMediaFromMatch(corpus, textid, m.getStart(), n.getEnd(), (EditorPart) editor, shell);
 		}
+		else {
+			return backtoMediaFromMatch(corpus, textid, m.getStart(), n.getEnd(), editor, shell);
+		}
 	}
 	
 	/**
@@ -281,7 +288,8 @@
 	 * @throws IOException
 	 * @throws CqiServerError
 	 */
-	public static Object backtoMediaFromMatch(CQPCorpus corpus, String textid, int keywordPosition, int keywordEndPosition, IWorkbenchPart editor, Shell shell) throws CqiClientException, IOException, CqiServerError {
+	public static Object backtoMediaFromMatch(CQPCorpus corpus, String textid, int keywordPosition, int keywordEndPosition, IWorkbenchPart editor, Shell shell) throws CqiClientException, IOException,
+			CqiServerError {
 		
 		TXMPreferences alternative = BackToMediaPreferences.getInstance();
 		String sStartTime, sEndTime;
@@ -370,6 +378,7 @@
 	
 	/**
 	 * Play the text associated media from a start-end time position
+	 * 
 	 * @param corpus
 	 * @param textid
 	 * @param sStartTime String in "sec.msec" or "hh:mm:ss" format
@@ -428,14 +437,15 @@
 					if (secured_media_password == null) {
 						URL url = new URL(media_directory);
 						
-						UsernamePasswordDialog dialog = new UsernamePasswordDialog(shell, new boolean[] { true, true }, url.getHost()) ;
+						UsernamePasswordDialog dialog = new UsernamePasswordDialog(shell, new boolean[] { true, true }, url.getHost());
 						dialog.setUsername(secured_media_login);
 						dialog.setTitle("You must authenticate to access the media file");
 						dialog.setDetails(NLS.bind(TXMUIMessages.loginToP0, new URL(media_directory).getHost()));
 						if (dialog.open() == dialog.OK) {
 							System.setProperty(BackToMediaPreferences.MEDIA_AUTH_PASSWORD, dialog.getPassword());
 							secured_media_password = dialog.getPassword();
-						} else {
+						}
+						else {
 							return null;
 						}
 					}
@@ -503,21 +513,22 @@
 				vlcEditor = OpenVLCPlayer.openEditor(path, sStartTime, sEndTime);
 				
 				// editor.getPlayer().setRepeat(true);
-				if (vlcEditor == null) { 
+				if (vlcEditor == null) {
 					Log.warning("Error: could not open the MediaPlayer.");
-					return null; 
+					return null;
 				}
 				
 				if (!vlcEditor.isMediaLoaded()) {
 					
 					vlcEditor.getSite().getPage().closeEditor(vlcEditor, false);
 					if (media_auth) {
-						Log.warning("The MediaPlayer could not open the media: "+media_directory); // don't show credentials
+						Log.warning("The MediaPlayer could not open the media: " + media_directory); // don't show credentials
 						System.clearProperty(BackToMediaPreferences.MEDIA_AUTH_PASSWORD);
 						System.clearProperty(BackToMediaPreferences.MEDIA_AUTH_LOGIN);
-					} else {
-						Log.warning("The MediaPlayer could not open the media: "+path);
 					}
+					else {
+						Log.warning("The MediaPlayer could not open the media: " + path);
+					}
 				}
 				
 				// move the editor in the window
Index: tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/OpenVLCPlayer.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/OpenVLCPlayer.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/OpenVLCPlayer.java	(revision 2421)
@@ -35,8 +35,14 @@
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
@@ -49,112 +55,119 @@
 
 // TODO: Auto-generated Javadoc
 /**
- * open the VLCPlayer Editor 
+ * open the VLCPlayer Editor
  * 
  * @author mdecorde.
  */
 public class OpenVLCPlayer extends AbstractHandler {
-
+	
 	/** The ID. */
 	public static String ID = "org.txm.rcp.commands.BackToMedia"; //$NON-NLS-1$
-
+	
 	/** The selection. */
 	private IStructuredSelection selection;
-
-	/* (non-Javadoc)
+	
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-
+		
 		Object o = HandlerUtil.getCurrentSelection(event);
 		if (o instanceof IStructuredSelection) {
-			selection = (IStructuredSelection)o;
+			selection = (IStructuredSelection) o;
 			Object s = selection.getFirstElement();
-			System.out.println(MessagesMP.select_object+s);
+			System.out.println(MessagesMP.select_object + s);
 		}
-
+		
 		Shell sh = HandlerUtil.getActiveShell(event);
 		InputDialog fd = new InputDialog(sh, "Opening media file...", "Enter file path or URL", "", null);
-		//FileDialog fd = new FileDialog(new Shell(), SWT.SAVE);
-		//fd.setText(MessagesMP.select_file);
-
-		//String[] filterExt = { "*.*", "*.mp3", "*.ogg", "*.avi", "*.mp4", "*.mov"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		//fd.setFilterExtensions(filterExt);
+		// FileDialog fd = new FileDialog(new Shell(), SWT.SAVE);
+		// fd.setText(MessagesMP.select_file);
+		
+		// String[] filterExt = { "*.*", "*.mp3", "*.ogg", "*.avi", "*.mp4", "*.mov"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		// fd.setFilterExtensions(filterExt);
 		if (fd.open() == fd.OK) {
-			 String mrl = fd.getValue();
-						if (mrl != null)
-							openEditor(mrl, 0);
+			String mrl = fd.getValue();
+			if (mrl != null)
+				openEditor(mrl, 0);
 		}
 		
 		return null;
 	}
-
-	public static void openEditor(String mrl,  int time) {
+	
+	public static void openEditor(String mrl, int time) {
 		IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
 		VLCPlayerEditorInput editorInput = new VLCPlayerEditorInput();
 		StatusLine.setMessage(MessagesMP.opening_media);
 		try {
 			VLCPlayerEditor player = (VLCPlayerEditor) page
-					.openEditor(editorInput,VLCPlayerEditor.ID);
+					.openEditor(editorInput, VLCPlayerEditor.ID);
 			if (player != null) {
 				player.getPlayer().play(mrl, time);
 				StatusLine.setMessage("");
 				if (mrl != null) {
 					player.setPartName(new File(mrl).getName());
 				}
-			} else {
+			}
+			else {
 				System.out.println(MessagesMP.error_open_media);
 			}
-		} catch (PartInitException e) {
+		}
+		catch (PartInitException e) {
 			e.printStackTrace();
 		}
 	}
-
+	
 	public static VLCPlayerEditor openEditor(String mrl, int time, int endtime) {
 		IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
 		VLCPlayerEditorInput editorInput = new VLCPlayerEditorInput();
 		StatusLine.setMessage(MessagesMP.opening_media);
 		try {
-			VLCPlayerEditor player = (VLCPlayerEditor) page.openEditor(editorInput,VLCPlayerEditor.ID);
+			VLCPlayerEditor player = (VLCPlayerEditor) page.openEditor(editorInput, VLCPlayerEditor.ID);
 			
-			//boolean isAudio = mrl.matches(".+\\.(mp3|ogg|wav|wpa)"); //$NON-NLS-1$
+			// boolean isAudio = mrl.matches(".+\\.(mp3|ogg|wav|wpa)"); //$NON-NLS-1$
 			if (player != null) {
 				player.getPlayer().play(mrl, time, endtime);
 				StatusLine.setMessage("");
-			} else {
+			}
+			else {
 				System.out.println(MessagesMP.error_open_media);
 				return null;
 			}
 			return player;
-		} catch (PartInitException e) {
+		}
+		catch (PartInitException e) {
 			e.printStackTrace();
 		}
 		
 		return null;
 	}
-
+	
 	public static VLCPlayerEditor openEditor(String path, String sStartTime,
 			String sEndTime) {
 		IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
 		VLCPlayerEditorInput editorInput = new VLCPlayerEditorInput();
 		StatusLine.setMessage(MessagesMP.opening_media);
 		try {
-			VLCPlayerEditor player = (VLCPlayerEditor) page.openEditor(editorInput,VLCPlayerEditor.ID);
+			IEditorPart editor = page.openEditor(editorInput, VLCPlayerEditor.ID);
+			if (editor == null) {
+				return null;
+			}
 			
-			//boolean isAudio = mrl.matches(".+\\.(mp3|ogg|wav|wpa)");
+			VLCPlayerEditor player = (VLCPlayerEditor) editor;
+			// boolean isAudio = mrl.matches(".+\\.(mp3|ogg|wav|wpa)");
 			if (player != null) {
 				player.getPlayer().play(path, sStartTime, sEndTime);
 				StatusLine.setMessage("");
-			} else {
-				System.out.println(MessagesMP.error_open_media);
-				return null;
 			}
 			return player;
-		} catch (PartInitException e) {
+		}
+		catch (PartInitException e) {
 			e.printStackTrace();
 		}
 		
 		return null;
 	}
-}
\ No newline at end of file
+}
Index: tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/preferences/BackToMediaPreferencePage.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/preferences/BackToMediaPreferencePage.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/preferences/BackToMediaPreferencePage.java	(revision 2421)
@@ -55,20 +55,27 @@
  */
 
 public class BackToMediaPreferencePage extends TXMPreferencePage {
-
+	
 	/** The Constant ID. */
 	public static final String ID = "org.txm.backtomedia.preferences.BackToMediaPreferencePage"; //$NON-NLS-1$
-
+	
 	/**
 	 * The display parts count in chart title state.
 	 */
 	private BooleanFieldEditor loopProperty;
+	
 	private ComboFieldEditor backtotext_position;
+	
 	private ComboFieldEditor useWordProperty;
+	
 	private StringFieldEditor defaultStructure;
+	
 	private StringFieldEditor defaultStructureStartProperty;
+	
 	private StringFieldEditor defaultStructureEndProperty;
+	
 	private StringFieldEditor defaultWordTimeProperty;
+	
 	private Group spanGroup;
 	
 	/**
@@ -80,16 +87,15 @@
 	
 	/*
 	 * (non-Javadoc)
-	 * 
 	 * @see
 	 * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
 	@Override
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(new BackToMediaPreferences().getPreferencesNodeQualifier()));
-		//this.setImageDescriptor(WordCloudAdapterFactory.ICON);
+		// this.setImageDescriptor(WordCloudAdapterFactory.ICON);
 	}
-
+	
 	/**
 	 * Creates the field editors. Field editors are abstractions of the common
 	 * GUI blocks needed to manipulate various types of preferences. Each field
@@ -98,18 +104,18 @@
 	@Override
 	public void createFieldEditors() {
 		
-		loopProperty = new BooleanFieldEditor(BackToMediaPreferences.REPEAT,MessagesMP.BackToMediaPreferencePage_1, getFieldEditorParent());
+		loopProperty = new BooleanFieldEditor(BackToMediaPreferences.REPEAT, MessagesMP.BackToMediaPreferencePage_1, getFieldEditorParent());
 		addField(loopProperty);
 		
-		String [][] choices = {{BackToMediaPreferences.WORDMODE, BackToMediaPreferences.WORDMODE},
-				{BackToMediaPreferences.STRUCTUREMODE, BackToMediaPreferences.STRUCTUREMODE},
-				{BackToMediaPreferences.MILESTONEMODE, BackToMediaPreferences.MILESTONEMODE}
-				};
-		useWordProperty = new ComboFieldEditor(BackToMediaPreferences.SYNCMODE,MessagesMP.BackToMediaPreferencePage_2, choices, getFieldEditorParent());
+		String[][] choices = { { BackToMediaPreferences.WORDMODE, BackToMediaPreferences.WORDMODE },
+				{ BackToMediaPreferences.STRUCTUREMODE, BackToMediaPreferences.STRUCTUREMODE },
+				{ BackToMediaPreferences.MILESTONEMODE, BackToMediaPreferences.MILESTONEMODE }
+		};
+		useWordProperty = new ComboFieldEditor(BackToMediaPreferences.SYNCMODE, MessagesMP.BackToMediaPreferencePage_2, choices, getFieldEditorParent());
 		
 		addField(useWordProperty);
 		
-		String[][] values = {{"ABOVE", ""+EModelService.ABOVE}, {"BELOW", ""+EModelService.BELOW}, {"LEFT_OF", ""+EModelService.LEFT_OF}, {"RIGHT_OF", ""+EModelService.RIGHT_OF}};
+		String[][] values = { { "ABOVE", "" + EModelService.ABOVE }, { "BELOW", "" + EModelService.BELOW }, { "LEFT_OF", "" + EModelService.LEFT_OF }, { "RIGHT_OF", "" + EModelService.RIGHT_OF } };
 		backtotext_position = new ComboFieldEditor(BackToMediaPreferences.BACKTOMEDIA_POSITION, "BackToMedia position", values, getFieldEditorParent());
 		addField(backtotext_position);
 		
@@ -123,16 +129,16 @@
 		rlayout.marginHeight = 5;
 		spanGroup.setLayout(rlayout);
 		
-		defaultWordTimeProperty = new StringFieldEditor(BackToMediaPreferences.WORD_PROPERTY,MessagesMP.BackToMediaPreferencePage_4, spanGroup);
+		defaultWordTimeProperty = new StringFieldEditor(BackToMediaPreferences.WORD_PROPERTY, MessagesMP.BackToMediaPreferencePage_4, spanGroup);
 		addField(defaultWordTimeProperty);
 		
-		defaultStructure = new StringFieldEditor(BackToMediaPreferences.STRUCTURE,MessagesMP.BackToMediaPreferencePage_5, spanGroup);
+		defaultStructure = new StringFieldEditor(BackToMediaPreferences.STRUCTURE, MessagesMP.BackToMediaPreferencePage_5, spanGroup);
 		addField(defaultStructure);
 		
-		defaultStructureStartProperty = new StringFieldEditor(BackToMediaPreferences.STRUCTURE_START_PROPERTY,MessagesMP.BackToMediaPreferencePage_6, spanGroup);
+		defaultStructureStartProperty = new StringFieldEditor(BackToMediaPreferences.STRUCTURE_START_PROPERTY, MessagesMP.BackToMediaPreferencePage_6, spanGroup);
 		addField(defaultStructureStartProperty);
 		
-		defaultStructureEndProperty = new StringFieldEditor(BackToMediaPreferences.STRUCTURE_END_PROPERTY,MessagesMP.BackToMediaPreferencePage_7, spanGroup);
+		defaultStructureEndProperty = new StringFieldEditor(BackToMediaPreferences.STRUCTURE_END_PROPERTY, MessagesMP.BackToMediaPreferencePage_7, spanGroup);
 		addField(defaultStructureEndProperty);
 		
 		updateEnables(BackToMediaPreferences.getInstance().getString(BackToMediaPreferences.SYNCMODE));
@@ -144,12 +150,14 @@
 			defaultStructureStartProperty.setEnabled(false, spanGroup);
 			defaultStructureEndProperty.setEnabled(false, spanGroup);
 			defaultWordTimeProperty.setEnabled(true, spanGroup);
-		} else if (BackToMediaPreferences.STRUCTUREMODE.equals(sync_mode)) {
+		}
+		else if (BackToMediaPreferences.STRUCTUREMODE.equals(sync_mode)) {
 			defaultStructure.setEnabled(true, spanGroup);
 			defaultStructureStartProperty.setEnabled(true, spanGroup);
 			defaultStructureEndProperty.setEnabled(true, spanGroup);
 			defaultWordTimeProperty.setEnabled(false, spanGroup);
-		} else { // milestones
+		}
+		else { // milestones
 			defaultStructure.setEnabled(true, spanGroup);
 			defaultStructureStartProperty.setEnabled(true, spanGroup);
 			defaultStructureEndProperty.setEnabled(false, spanGroup);
Index: tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/preferences/BackToMediaPreferences.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/preferences/BackToMediaPreferences.java	(revision 2420)
+++ tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/preferences/BackToMediaPreferences.java	(revision 2421)
@@ -7,48 +7,59 @@
 import org.txm.core.preferences.TXMPreferences;
 
 public class BackToMediaPreferences extends TXMPreferences {
-
+	
 	// auto populate the preference node qualifier from the current bundle id
-//	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(BackToMediaPreferences.class).getSymbolicName();
+	// public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(BackToMediaPreferences.class).getSymbolicName();
 	
 	public static final String PREFERENCES_PREFIX = "backtomedia_";
 	
 	public static final String REPEAT = "backtomedia_loop"; //$NON-NLS-1$
+	
 	public static final String SYNCMODE = "sync_mode"; //$NON-NLS-1$
-
+	
 	public static final String STRUCTURE = "backtomedia_structure"; //$NON-NLS-1$
+	
 	public static final String STRUCTURE_START_PROPERTY = "backtomedia_startproperty"; //$NON-NLS-1$
+	
 	public static final String STRUCTURE_END_PROPERTY = "backtomedia_endproperty"; //$NON-NLS-1$
+	
 	public static final String WORD_PROPERTY = "backtomedia_wordtime_property"; //$NON-NLS-1$
+	
 	public static final String WORD_CONTEXT_LEFT_DISTANCE = "backtomedia_word_context_left_distance"; //$NON-NLS-1$
+	
 	public static final String WORD_CONTEXT_RIGHT_DISTANCE = "backtomedia_word_context_right_distance"; //$NON-NLS-1$
-
+	
 	// the sync modes
 	public static final String WORDMODE = "Word";
+	
 	public static final String STRUCTUREMODE = "Structure";
+	
 	public static final String MILESTONEMODE = "Milestone";
-
+	
 	public static final String MEDIA_PATH_PREFIX = "media_path_prefix";
+	
 	public static final String MEDIA_EXTENSION = "media_extension";
 	
 	public static final String MEDIA_AUTH = "media_auth";
+	
 	public static final String MEDIA_AUTH_LOGIN = "media_auth_login";
+	
 	public static final String MEDIA_AUTH_PASSWORD = "media_auth_password";
-
+	
 	/**
 	 * preferences node to media file access paths
 	 */
 	public static final String MEDIA_INDEX_NODE = "media_index_node";
 	
 	/**
-	 * one of the EModelService position constant to use when opening editor: 	ABOVE = 0 BELOW = 1 LEFT_OF = 2 RIGHT_OF = 3
+	 * one of the EModelService position constant to use when opening editor: ABOVE = 0 BELOW = 1 LEFT_OF = 2 RIGHT_OF = 3
 	 */
 	public static final String BACKTOMEDIA_POSITION = "backtomedia_position"; //$NON-NLS-1$
 	
 	public BackToMediaPreferences() {
 		// TODO Auto-generated constructor stub
 	}
-
+	
 	@Override
 	public void initializeDefaultPreferences() {
 		super.initializeDefaultPreferences();
@@ -67,9 +78,10 @@
 	
 	/**
 	 * Gets the instance.
+	 * 
 	 * @return the instance
 	 */
-	public static TXMPreferences getInstance()	{
+	public static TXMPreferences getInstance() {
 		if (!TXMPreferences.instances.containsKey(BackToMediaPreferences.class)) {
 			new BackToMediaPreferences();
 		}
