@@ -470,17 +470,25 @@ function fgfs () {

                     unset hangar

                     return

                     ;;

+                --mumble)

+                    if pgrep -u $USER mumble > /dev/null; then

+                        echo "there is already a mumble instance launched"

+                    else

+                        mumble_desktop_entry=($(if test -n "$XDG_DATA_DIRS"; then find "${(s/:/)XDG_DATA_DIRS}" -type f,l -iname "*mumble*desktop"; fi))

+                        if test ${#mumble_desktop_entry[@]} -gt 0; then

+                            echo lauching ${mumble_desktop_entry[1]}

+                            nohup gtk-launch ${mumble_desktop_entry[1]##*/} > /dev/null 2>&1 &

+                        else

+                            echo "no desktop entry found for mumble (XDG_DATA_DIRS=$XDG_DATA_DIRS)"

+                            return 1

+                        fi

+                    fi

+                    ;& # on continue avec l'addon fgcom

                 --fgcom)

-                    if test \

-                        -r $FGADDON/Addons/fgcom-mumble/FGData/Protocol/fgcom-mumble.xml \

-                     -a -r $HOME/.local/share/Mumble/Mumble/Plugins/fgcom-mumble.so \

-                     -a -h $fgfs_install/mumble/lib/libPocoZip.so \

-                     -a -x $fgfs_install/mumble/bin/mumble; then

-                        nohup sh -c "LD_LIBRARY_PATH=$fgfs_install/mumble/lib $fgfs_install/mumble/bin/mumble" > /dev/null 2>&1 &

-                        fgfs_args+=("--addon=$FGADDON/Addons/fgcom-mumble")

-                        fgfs_args+=("--generic=socket,out,10,localhost,16661,udp,fgcom-mumble")

+                    if test -r $fgfs_source/fgcom-mumble/client/fgfs-addon/addon-metadata.xml; then

+                        fgfs_args+=("--addon=$fgfs_source/fgcom-mumble/client/fgfs-addon")

                     else

-                        echo "can't find protocol definition, or fgcom-mumble plugin"

+                        echo "can't find addon fgcom-mumble"

                         return 1

                     fi

                     ;;

@@ -1 +0,0 @@

-mumble

@@ -1,12 +0,0 @@

-mkdir -p $fgfs_build/poco

-cd $fgfs_build/poco

-cmake -DCMAKE_INSTALL_PREFIX=$fgfs_install/mumble -j$simultaneous $fgfs_source/mumble/3rdparty/poco

-make -j$simultaneous

-make install

-

-cmake_options+=("-DCMAKE_PREFIX_PATH=$fgfs_install/mumble")

-cmake_options+=("-DCMAKE_INCLUDE_PATH=$fgfs_install/mumble/include")

-cmake_options+=("-Doverlay-xcompile=OFF")

-cmake_options+=("-Dserver=OFF")

-cmake_options+=("-Dretracted-plugins=OFF")

-cmake_options+=("-Dplugins=OFF")