Browse Source

Renaming (source)

tags/1.0.1
Clement Lefebvre 5 years ago
parent
commit
7182d2f359
100 changed files with 10342 additions and 10342 deletions
  1. +4
    -4
      COPYING
  2. +1634
    -1634
      ChangeLog
  3. +5511
    -5511
      ChangeLog.pre-gitlog
  4. +4
    -4
      Makefile.am
  5. +57
    -57
      NEWS
  6. +5
    -5
      README
  7. +1
    -1
      autogen.sh
  8. +111
    -111
      browser-plugin/Makefile.am
  9. +537
    -537
      browser-plugin/Makefile.in
  10. +8
    -8
      browser-plugin/README.browser-plugin
  11. +3
    -3
      browser-plugin/org_gnome_totem_PluginViewer.xml
  12. +7
    -7
      browser-plugin/test-glow-button.c
  13. +45
    -45
      browser-plugin/totem-glow-button.c
  14. +13
    -13
      browser-plugin/totem-glow-button.h
  15. +15
    -15
      browser-plugin/totem-plugin-viewer-constants.h
  16. +50
    -50
      browser-plugin/totem-plugin-viewer-interface.h
  17. +19
    -19
      browser-plugin/totem-plugin-viewer-options.h
  18. +360
    -360
      browser-plugin/totem-plugin-viewer.c
  19. +21
    -21
      browser-plugin/totemCone.cpp
  20. +10
    -10
      browser-plugin/totemCone.h
  21. +17
    -17
      browser-plugin/totemConeAudio.cpp
  22. +10
    -10
      browser-plugin/totemConeAudio.h
  23. +17
    -17
      browser-plugin/totemConeInput.cpp
  24. +10
    -10
      browser-plugin/totemConeInput.h
  25. +24
    -24
      browser-plugin/totemConePlaylist.cpp
  26. +10
    -10
      browser-plugin/totemConePlaylist.h
  27. +16
    -16
      browser-plugin/totemConePlaylistItems.cpp
  28. +10
    -10
      browser-plugin/totemConePlaylistItems.h
  29. +18
    -18
      browser-plugin/totemConeVideo.cpp
  30. +10
    -10
      browser-plugin/totemConeVideo.h
  31. +27
    -27
      browser-plugin/totemGMPControls.cpp
  32. +10
    -10
      browser-plugin/totemGMPControls.h
  33. +17
    -17
      browser-plugin/totemGMPError.cpp
  34. +10
    -10
      browser-plugin/totemGMPError.h
  35. +17
    -17
      browser-plugin/totemGMPNetwork.cpp
  36. +11
    -11
      browser-plugin/totemGMPNetwork.h
  37. +55
    -55
      browser-plugin/totemGMPPlayer.cpp
  38. +11
    -11
      browser-plugin/totemGMPPlayer.h
  39. +22
    -22
      browser-plugin/totemGMPPlaylist.cpp
  40. +10
    -10
      browser-plugin/totemGMPPlaylist.h
  41. +26
    -26
      browser-plugin/totemGMPSettings.cpp
  42. +10
    -10
      browser-plugin/totemGMPSettings.h
  43. +16
    -16
      browser-plugin/totemMullYPlugin.cpp
  44. +10
    -10
      browser-plugin/totemMullYPlugin.h
  45. +32
    -32
      browser-plugin/totemNPClass.cpp
  46. +17
    -17
      browser-plugin/totemNPClass.h
  47. +54
    -54
      browser-plugin/totemNPObject.cpp
  48. +25
    -25
      browser-plugin/totemNPObject.h
  49. +19
    -19
      browser-plugin/totemNPObjectWrapper.h
  50. +19
    -19
      browser-plugin/totemNPVariantWrapper.h
  51. +28
    -28
      browser-plugin/totemNarrowSpacePlugin.cpp
  52. +7
    -7
      browser-plugin/totemNarrowSpacePlugin.h
  53. +347
    -347
      browser-plugin/totemPlugin.cpp
  54. +48
    -48
      browser-plugin/totemPlugin.h
  55. +51
    -51
      browser-plugin/totemPluginGlue.cpp
  56. +11
    -11
      browser-plugin/totemVegasPlugin.cpp
  57. +7
    -7
      browser-plugin/totemVegasPlugin.h
  58. +3
    -3
      config.h.in
  59. +86
    -86
      configure
  60. +42
    -42
      configure.ac
  61. +29
    -29
      data/Makefile.am
  62. +40
    -40
      data/Makefile.in
  63. +9
    -9
      data/fullscreen.ui
  64. +3
    -3
      data/icons/16x16/Makefile.am
  65. +8
    -8
      data/icons/16x16/Makefile.in
  66. +3
    -3
      data/icons/22x22/Makefile.am
  67. +8
    -8
      data/icons/22x22/Makefile.in
  68. +2
    -2
      data/icons/24x24/Makefile.am
  69. +7
    -7
      data/icons/24x24/Makefile.in
  70. +1
    -1
      data/icons/256x256/Makefile.am
  71. +6
    -6
      data/icons/256x256/Makefile.in
  72. +3
    -3
      data/icons/32x32/Makefile.am
  73. +8
    -8
      data/icons/32x32/Makefile.in
  74. +2
    -2
      data/icons/48x48/Makefile.am
  75. +7
    -7
      data/icons/48x48/Makefile.in
  76. +1
    -1
      data/icons/Makefile.am
  77. +6
    -6
      data/icons/Makefile.in
  78. +1
    -1
      data/icons/scalable/Makefile.am
  79. +6
    -6
      data/icons/scalable/Makefile.in
  80. +2
    -2
      data/icons/totem.svg
  81. +2
    -2
      data/mime-type-imports.sh
  82. +2
    -2
      data/mime-type-include.sh
  83. +2
    -2
      data/mime-type-list.txt
  84. +2
    -2
      data/mozilla-viewer.ui
  85. +4
    -4
      data/org.gnome.totem.gschema.xml.in.in
  86. +6
    -6
      data/playlist.ui
  87. +2
    -2
      data/preferences.ui
  88. +1
    -1
      data/totem-bugreport.py
  89. +10
    -10
      data/totem-video-thumbnailer.1
  90. +7
    -7
      data/totem-video-thumbnailer.pod
  91. +36
    -36
      data/totem.1
  92. +25
    -25
      data/totem.convert
  93. +11
    -11
      data/totem.desktop.in.in.in
  94. +4
    -4
      data/totem.pc.in
  95. +2
    -2
      data/totem.thumbnailer.in
  96. +6
    -6
      data/totem.ui
  97. +1
    -1
      debian/bug/control
  98. +350
    -350
      debian/changelog
  99. +56
    -56
      debian/control
  100. +56
    -56
      debian/control.in

+ 4
- 4
COPYING View File

@@ -342,13 +342,13 @@ consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.

The Totem project hereby grants permission for non-GPL compatible
The Xplayer project hereby grants permission for non-GPL compatible
GStreamer plugins to be used and distributed together with GStreamer and
Totem. This permission is above and beyond the permissions granted by
the GPL license by which Totem is covered. If you modify this code, you may
Xplayer. This permission is above and beyond the permissions granted by
the GPL license by which Xplayer is covered. If you modify this code, you may
extend this exception to your version of the code, but you are not obligated
to do so. If you do not wish to do so, delete this exception statement from
your version.

Note that the src/totem-subtitle-encoding.c file was relicensed to LGPL
Note that the src/xplayer-subtitle-encoding.c file was relicensed to LGPL
(see http://bugzilla.gnome.org/show_bug.cgi?id=515809).

+ 1634
- 1634
ChangeLog
File diff suppressed because it is too large
View File


+ 5511
- 5511
ChangeLog.pre-gitlog
File diff suppressed because it is too large
View File


+ 4
- 4
Makefile.am View File

@@ -15,13 +15,13 @@ EXTRA_DIST = \
intltool-merge.in \
intltool-update.in \
AUTHORS NEWS \
totem.spec.in \
totem.spec \
xplayer.spec.in \
xplayer.spec \
ChangeLog.pre-gitlog \
MAINTAINERS \
totem.doap
xplayer.doap

CLEANFILES = totem.spec
CLEANFILES = xplayer.spec

MAINTAINERCLEANFILES = \
$(srcdir)/INSTALL \


+ 57
- 57
NEWS View File

@@ -10,7 +10,7 @@ Major changes in 3.10.0:
Major changes in 3.9.92:
- RTL bug fixes for playback icons
- Fix year tag not showing in some cases
- Remove obsolete totem-disc usage
- Remove obsolete xplayer-disc usage
- Port zeitgeist plugin to zeitgeist-2.0

Major changes in 3.9.5:
@@ -120,7 +120,7 @@ Plugins:
* Remove obsolete youtube and bemused plugins
* Port browser plugin to GDBus
* Fix getting the cover art in the movie player
* Fix crasher when Totem is passed arguments
* Fix crasher when Xplayer is passed arguments

3.2.1:
* Fix crash when framerate isn't available
@@ -309,7 +309,7 @@ and also:
* Movie Player:
- Port from libunique to GApplication
- Rework cancellation in the YouTube plugin to remove races
- Reorganise the core code into an installed library, libtotem.so
- Reorganise the core code into an installed library, libxplayer.so
- Add gobject-introspection support to this library
- Make it possible to build plugins out of tree by installing a few header files
- Remove the old Python and Vala bindings in favour of introspection
@@ -349,7 +349,7 @@ and also:
- Better download buffering handling
- Fix crasher when PyGTK is badly installed
- Avoid problems with seeking when pausing the video too early
- Fix link to Totem website in error messages
- Fix link to Xplayer website in error messages
- Disable seeking in DVD menus
- Make Eject menu item work for DVDs
- Fix playback from FTP sites
@@ -385,7 +385,7 @@ and also:
- Implement type-ahead search
- Display embedded cover images in audio streams
- Add "fullscreen" button in the main video UI
- Fix for new TotemPlParser API
- Fix for new XplayerPlParser API
- Fix the time elapsed not showing up in the status bar
with newer GTK+
- Fix translation of skip menu items in RTL languages
@@ -439,7 +439,7 @@ and also:
- Remember the current file position when Pause is clicked
- Show menu item description in status bar
- Make Home and End keys seek to the start and the end of streams
- Use Totem's icon as the main window logo
- Use Xplayer's icon as the main window logo
- Make screenshot dialogue more like GNOME's
- Bug fixes:
- Fix crash when a storage volume is encrypted
@@ -468,7 +468,7 @@ and also:
- Move subtitles-related menu items to View → Subtitles.
- Bug fixes:
- Fix loading subtitles from the cache
- Fix loading videos when Totem is already running
- Fix loading videos when Xplayer is already running
- Fix drag'n'dropping a video onto itself reloading the video
- Only add a file to the recent files when it has been played,
makes startup with loads of files much quicker
@@ -497,7 +497,7 @@ Major changes:

New features:
* Add a D-Bus service plugin, to allow getting playback information
from a running Totem
from a running Xplayer
* Add support for DVD navigation to the GStreamer backend

Misc bug fixes:
@@ -520,7 +520,7 @@ Misc bug fixes:
* Make the gallery creation progress window work as expected
* Fix a possible crasher when getting metadata in the xine-lib backend
* Many build fixes
* Make Totem more robust when Python fails to initialise
* Make Xplayer more robust when Python fails to initialise

2.25.90:
* Add a UPNP/DLNA plugin
@@ -636,14 +636,14 @@ Misc bug fixes:
- Remove need to configure the MythTV plugin, use UPNP instead
- Add a progress bar to the YouTube plugin
- Add support for high-res YouTube videos
- Use ~/.local/share/totem/plugins/ for user-plugins
- Use ~/.local/share/xplayer/plugins/ for user-plugins

2.23.3:
* Update FSF address in the sources
* Use GIO when a GIO source isn't available (xine-lib, GStreamer)
* Reset player state when we get an error whilst syncing
* Add Totem specific application/x-totem-plugin type to the browser plugin
* Fix building against latest totem-pl-parser
* Add Xplayer specific application/x-xplayer-plugin type to the browser plugin
* Fix building against latest xplayer-pl-parser
* Fix browser plugin not showing on http://www.la1.be site

2.23.2:
@@ -701,8 +701,8 @@ Misc bug fixes:

2.21.94:

Note that configuration files are now in ~/.config/totem/ instead
of ~/.gnome2/Totem. You will need to move the files by hand.
Note that configuration files are now in ~/.config/xplayer/ instead
of ~/.gnome2/Xplayer. You will need to move the files by hand.

* Movie player:
- Fix crash when pressing a remote button in windowed mode
@@ -710,7 +710,7 @@ of ~/.gnome2/Totem. You will need to move the files by hand.
- Better support for using "--fullscreen" on startup
- Default to using the fastest speed for MMS streaming
- Support auto-loading subtitles when the suffix is upper-case
- Add a bug-buddy script so we get more information when totem crashes
- Add a bug-buddy script so we get more information when xplayer crashes
* Browser plugin:
- Support the audio/x-ms-wma mime-type
- Better VLC Javascript support
@@ -767,7 +767,7 @@ of ~/.gnome2/Totem. You will need to move the files by hand.
* Fix building with newer versions of Vala
* Make the icon bigger when the launcher is dropped on the desktop
* Ignore backup files when adding them to the playlist
* Only put Totem on top when playing audio
* Only put Xplayer on top when playing audio
* Install the Nautilus extension in the correct directory
* Browser plugin:
- Reduce the number of times the button glows in the browser plugin
@@ -781,15 +781,15 @@ of ~/.gnome2/Totem. You will need to move the files by hand.

2.21.4:
* Small improvements to the playlist sharing plugin
* Depend on the split totem-pl-parser module
* Depend on the split xplayer-pl-parser module

2.21.3:
* Add a sharing plugin using libepc
* Add a Tracker-based video search plugin
* Add the ability to select text subtitles for files in the UI
* Port the mythtv plugin to using the TotemVideoList
* Port the mythtv plugin to using the XplayerVideoList
* Show a busy cursor when loading tracks from the YouTube plugin
* Restore the previously active sidebar page when restarting Totem
* Restore the previously active sidebar page when restarting Xplayer
* Add the --no-existing-session argument to allow launching multiple
instances of the Movie Player

@@ -823,7 +823,7 @@ of ~/.gnome2/Totem. You will need to move the files by hand.
* Podcast parsing fixes, including parsing data from links as supplied
by the "Connecting to the iTunes Store" page
* Add support for XM tracker files
* Fix totem-audio-preview to support both the current nautilus behaviour, and
* Fix xplayer-audio-preview to support both the current nautilus behaviour, and
the one used in the gio porting branch

2.21.0, Changes from 2.20.1
@@ -836,7 +836,7 @@ of ~/.gnome2/Totem. You will need to move the files by hand.
- Disable text subtitles loading by default, as it can slow opening new files down
- Look for text subtitle files in the subtitles/ sub-directory as well
- Make it possible to select a DVD menu item with the 5 key of the numeric pad
- Add a totem-audio-preview program that plays audio data passed from the standard
- Add a xplayer-audio-preview program that plays audio data passed from the standard
input, as can be used by Nautilus' audio preview

* Bugs
@@ -855,7 +855,7 @@ of ~/.gnome2/Totem. You will need to move the files by hand.
* Playlist parser:
- Add RSS and Atom podcasts parsing, including URLs reserved for iTunes
- Add metadata to the "playlist-started" signal
- Add totem_plparser_parse_duration
- Add xplayer_plparser_parse_duration
- Add support for the autoplay metadata in QuickTime metalinks
- Add support for the abstract, copyright, author and moreinfo
properties for ASX playlists
@@ -948,14 +948,14 @@ Bug fixes:
* Features:
- Add basic DVB support
- Add a plugin system
- Add the "On Top" plugin, to make Totem stay on top when playing a video
- Add the "On Top" plugin, to make Xplayer stay on top when playing a video
- Add the "Galago" plugin, to set your IM status when playing videos
in fullscreen
- Move LIRC support, Media Players key support, and Telestrator to plugins
- Use xdg-user-dirs to add the Movies and Music shortcuts to the file choosers
- Make "Enter" dismiss the "Open Location" dialogue
- Move the play/pause button to the leftmost of the UI
- Make Totem only send ticks when playing, not when paused or stopped
- Make Xplayer only send ticks when playing, not when paused or stopped
- Use play/pause icons in the playlist to show the current state,
as in Rhythmbox
- Allow capture a specific time in a movie using the thumbnailer
@@ -963,7 +963,7 @@ Bug fixes:
* Don't crash when we can't get a display name for the file we're trying to play
* Don't crash on exit when LIRC is used
* Some multi-head fixes
* Move all the configuration files to ~/.gnome2/Totem
* Move all the configuration files to ~/.gnome2/Xplayer
* Remove the webcam application Vanity
* Curb the resources used by the video thumbnailer and indexer
* Make the pause remote key actually pause
@@ -981,7 +981,7 @@ Bug fixes:
button when the volume is 0 on startup

* Browser plugin:
- Allow disabling Totem for specific mime-types user-wide, and system-wide
- Allow disabling Xplayer for specific mime-types user-wide, and system-wide
- Make the volume button scroll in the right direction
- Remove rejection of streams based on mime-type, too many false positives
- Make the Complex plugin report version "10.0", as is current for the Helix
@@ -1018,7 +1018,7 @@ Bug fixes:
* Don't change the screen resolution when switching to fullscreen
and the resolution isn't the highest possible
* Don't crash when the XRandR extension isn't available
* Avoid crashes when Totem is compiled with LIRC support, and
* Avoid crashes when Xplayer is compiled with LIRC support, and
no remoted are configured
* Make the ASX playlist parser more robust
* Browser:
@@ -1030,7 +1030,7 @@ Bug fixes:
2.17.92
* Fix building when /bin/sh isn't Bash
* Add better debugging support to the thumbnailer and indexer
* Don't crash when launch Totem with no filenames, and Totem
* Don't crash when launch Xplayer with no filenames, and Xplayer
is already started
* Thumbnailer:
- Fix problems with the first frame being captured sometimes
@@ -1068,7 +1068,7 @@ Bug fixes:
* Append "#X" number to duplicate languages in the menu entries
* Add "TrueAudio" as a supported file type
* Add an uninstalled pkgconfig file for the playlist parser
* Fix launching Totem remotely (broken by GOption work earlier in 2.17.x)
* Fix launching Xplayer remotely (broken by GOption work earlier in 2.17.x)
* Make GTK+-only version compile again
* Fix disabling the browser plugin using configure
* Playlist parser:
@@ -1113,7 +1113,7 @@ Bug fixes:
- Only use accelerated video for the main movie when loading small "QuickTime"
redirect movies from apple.com
- Only show errors after having parsed a playlist if the parsing failed, show
the totem logo if the playlist was empty
the xplayer logo if the playlist was empty
* Playlist parser:
- Use less memory when checking whether a file can be parsed as a playlist
- Support "Google Video Pointer" playlists
@@ -1162,7 +1162,7 @@ Bug fixes:
to fullscreen
* Re-add the Properties menu item, to make it more discoverable
* Fix accessibility with the seek bar
* Remember the sidebar size when Totem exits maximised
* Remember the sidebar size when Xplayer exits maximised
* Fix the playlist not accepting new drops after a drop caused an error
dialogue to appear

@@ -1215,7 +1215,7 @@ Bug fixes:
- Fix parsing of empty files
- Fix some old D-Bus usage
- Remove HAL < 0.5 support
* Make Totem the only application that fully implements session saving
* Make Xplayer the only application that fully implements session saving
* Resize the window properly when showing/hiding the controls

2.17.0
@@ -1282,13 +1282,13 @@ Bug fixes:
- Split the plugin in 4 different plugins, to allow
name-based detection to work, and different Javascript interfaces
to be used (Real Player/Helix, Windows Media Player and Quicktime
compatible, and basic Totem)
compatible, and basic Xplayer)
- Handle repeat and autostart parameters
- Make sure the plugin is available for all Mozilla-based browsers
- Make scrolling on the volume widget work as it should
* New icon
* Use HAL to determine the disc type
* Save and restore which sidebar was showing, and whether Totem was
* Save and restore which sidebar was showing, and whether Xplayer was
maximised
* Fix the window title not changing when playing files with broken names
* Fix Ctrl+Q not working in fullscreen
@@ -1340,7 +1340,7 @@ Bug fixes:
* Add Impulse Tracker and MOD files to the list of supported types
* Add audio/vnd.rn-realaudio as a supported playlist format
* Use theme friendly window icons
* Fix a new installation of Totem not using visualisation (GStreamer)
* Fix a new installation of Xplayer not using visualisation (GStreamer)

1.5.1
* Add XSPF playlists read and write support
@@ -1402,12 +1402,12 @@ Bug fixes:
* Bigger and better logo
* Fix a possible crash with the ASF playlist parser
* Add support for the target property, opening the movie in a stand-alone
Totem (Mozilla plugin)
Xplayer (Mozilla plugin)
* Add support for background music (Mozilla plugin)
* Take the aspect ratio of the screen when setting the size of the
visualisations (xine-lib, GStreamer 0.10)
* Fix compilation with glib < 2.8
* Add ability to disable text subtitles when Totem loads them automatically
* Add ability to disable text subtitles when Xplayer loads them automatically
(xine-lib)
* Better logo mode handling (GStreamer 0.8)
* Free the video output after showing images (GStreamer 0.8)
@@ -1422,7 +1422,7 @@ Bug fixes:

1.3.90:
* Use Ctrl+S as "Take Screenshot..." shortcut
* Fix a possible crash on start with multiple totem processes
* Fix a possible crash on start with multiple xplayer processes
* Support application/smil and application/x-smil mime-types
* Better parsing of SMIL playlists
* Better parsing of ASX playlists with multiple REF entries per ENTRY
@@ -1496,10 +1496,10 @@ Bug fixes:
* Fix duplicate access key in the display preferences
* Fix wrong accesskeys for the saturation and hue sliders
* Show the video properties again when a stream has video
* Move Totem's remote socket to TMPDIR
* Move Xplayer's remote socket to TMPDIR
* Remove libmusicbrainz dependency
* Detect DVDs and VCDs properly on a pmount setup
* Don't save Totem's thumbnail with an alpha component, for recent
* Don't save Xplayer's thumbnail with an alpha component, for recent
Nautilus changes
* Remove keyboard shortcuts from the main video popup menu
* Fix resizing of the sidebar
@@ -1525,7 +1525,7 @@ xine-lib:
(xine-lib)

1.1.5:
* Fix Totem not finding the type of a disc when it's not in /etc/fstab
* Fix Xplayer not finding the type of a disc when it's not in /etc/fstab
* Some (more) volume button fixes
* Don't leak memory when getting the supported mime-types of the plugin
* Fix generation of the playlist-end signal in the playlist parser
@@ -1622,8 +1622,8 @@ xine-lib:
movie menu
* Add a preference to select the subtitle font
* Avoid the progress bar changing the status bar's height
* Allow Totem to be passed multiple files by Nautilus
* Translate the language names in Totem's menus
* Allow Xplayer to be passed multiple files by Nautilus
* Translate the language names in Xplayer's menus
* Make the "Skip to..." dialog appear again
* Don't crash if the playlist contains non-UTF8 data
* Fix parsing of some ASX playlists
@@ -1638,7 +1638,7 @@ xine-lib:
* Prevent a click in the recent files really opening the first file twice
* Add --play and --pause command-line options
* Fix compilation with glibc 2.2 systems
* Add a man page for totem-video-thumbnailer, and update the totem one
* Add a man page for xplayer-video-thumbnailer, and update the xplayer one
* Fix possible crash in the BaconMessageConnection
* Require glib 2.6.3 to fix the thumbnailer exiting too soon
* Fix date shown from some OGG files (GStreamer)
@@ -1677,7 +1677,7 @@ xine-lib:
* Don't crash when a file fails to open (GStreamer)
* Automatic subtitles support (GStreamer)
* Mouse interactivity support (GStreamer)
* Install Totem's .desktop file properly
* Install Xplayer's .desktop file properly
* Fix volume setting on startup
* Fix the sound device not being released in some cases
* Fix non-stereo audio playback (xine-lib)
@@ -1733,7 +1733,7 @@ xine-lib:

0.99.20:
* Add a beta "Telestrator" mode
* Fix a crash when closing Totem with non-file locations
* Fix a crash when closing Xplayer with non-file locations
* Set the current file chooser paths correctly
* Fix "Play Disc..." when the detected device is a symbolic link
* Remove warnings when zooming in a window with no video
@@ -1770,7 +1770,7 @@ xine-lib:
* Work-around a bug in xine-lib where it wouldn't send the right error
message if trying to play a DVD without libdvdcss installed
* Make --debug actually work for the instance that's being started
* Make "totem --quit" just exit if there's no running Totem instance
* Make "xplayer --quit" just exit if there's no running Xplayer instance
* Make Ctrl+A select all the files in the playlist window
* Fix error message when the codec doesn't have a nice name
* Fix properties windows when the file doesn't have audio or video
@@ -1820,7 +1820,7 @@ xine-lib:
* Make aspect ratio a submenu, instead of being toggled
* Screenshot dialog fixes
* Fix a crasher in the m3u with extinfo parsing
* Get all the icons from the installed Totem if not otherwise available
* Get all the icons from the installed Xplayer if not otherwise available
* Fix a crasher on startup detecting the DVD+ drives
* Fix the release of the sound device when paused
* Add German documentation translation by Sebastian Heinlein
@@ -1840,11 +1840,11 @@ xine-lib:
* Stock icons support
* Have the command-line options translated
* Added context menu in the playlist to copy URLs/filenames to the clipboard
* Added a man page for totem
* Added a man page for xplayer
* Install handlers for mms, pnm and rtsp protocols in the xine-lib backend
* Add a button to reset the colour balance settings
* Make the fullscreen slider work again
* Make "totem cd:" work again
* Make "xplayer cd:" work again
* Restore the default audio stream if a custom one is not available in the
file that we're about to play
* Don't crash when the "none" video output plugin isn't available
@@ -1884,7 +1884,7 @@ xine-lib:
* Fix Real playlists support with "stop" commands
* Support the XvMC video driver
* Support audio/x-ms-asf data type
* Added ability to launch totem in fullscreen mode
* Added ability to launch xplayer in fullscreen mode
* Fix compilation with GTK+ 2.3.x

0.99.7:
@@ -1984,7 +1984,7 @@ enabled (useful for TV output)
default
* Try harder to thumbnail short movies
* Make OGM subtitles and alternate soundtracks work
* Fix a crash when starting up totem from nautilus with more than one file
* Fix a crash when starting up xplayer from nautilus with more than one file
* Autostart playback of optical media if they're listed on the command-line
* FreeBSD build fixes

@@ -1997,11 +1997,11 @@ enabled (useful for TV output)
as a bookmark system
* devfs support, FreeBSD support and misc. parsing fixes for the CD
selection widget
* moved fullscreen code out of the video widget and into totem (enables
* moved fullscreen code out of the video widget and into xplayer (enables
fullscreen to work on the gstreamer backend)
* Automatic GNOME-based Proxy configuration
* Make the visual quality option menu actually work
* Add the /apps/totem/debug entry to enable debug in the playback engine
* Add the /apps/xplayer/debug entry to enable debug in the playback engine
* Fixes concerning the colliding error and buffering dialogs
* Added a --disable-lirc argument to configure
* Fix handling of Recent Files and URIs
@@ -2054,7 +2054,7 @@ enabled (useful for TV output)
* Fix a crash when it was a URI being drag and not a local filename
* Fix build system for the thumbnailer's schemas
* Much less verbosity on the command line
* Fix a problem with the "remote" API which would make Totem receive only
* Fix a problem with the "remote" API which would make Xplayer receive only
the first file of a list of them
* Fix a crash when changing the resolution of the screen, in fullscreen mode

@@ -2063,7 +2063,7 @@ enabled (useful for TV output)

0.95.0:
* Xinerama, dual-head and RandR support
* Added a "remote" mode to control a running Totem
* Added a "remote" mode to control a running Xplayer
* Seeking with the seekbar is no longer a mess
* Fix screenshots when the aspect ratio was 1.0
* Better error reporting
@@ -2088,7 +2088,7 @@ enabled (useful for TV output)
* added a statusbar
* added CDDA support (Digital CD playback)
* added subtitle support (only on the command-line, use like:
"totem file.avi#subtitle:file.sub")
"xplayer file.avi#subtitle:file.sub")
* added a dialog for more precise seeking
* plenty of bug fixes



+ 5
- 5
README View File

@@ -2,7 +2,7 @@
_|_ __|_ _ ._ _
|_(_)|_(/_| | |

Totem is movie player for the GNOME desktop based on GStreamer.
Xplayer is movie player for the GNOME desktop based on GStreamer.
It features a playlist, a full-screen mode, seek and volume controls,
as well as complete keyboard navigation.

@@ -105,17 +105,17 @@ BUGS
====

Bugs should be filed in GNOME's Bugzilla:
http://bugzilla.gnome.org/enter_bug.cgi?product=totem
http://bugzilla.gnome.org/enter_bug.cgi?product=xplayer

To get a better debug output, run:
# totem --debug
# xplayer --debug

Or for the stand-alone applications:
# gsettings set org.gnome.totem debug true
# gsettings set org.gnome.xplayer debug true
then run your application and capture its output

Contact
=======

Bastien Nocera <hadess@hadess.net>
http://www.gnome.org/projects/totem/
http://www.gnome.org/projects/xplayer/

+ 1
- 1
autogen.sh View File

@@ -4,7 +4,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.

PKG_NAME="totem"
PKG_NAME="xplayer"
ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"

(test -f $srcdir/configure.ac) || {


+ 111
- 111
browser-plugin/Makefile.am View File

@@ -19,17 +19,17 @@ plugin_sources = \
npapi.h \
npruntime.h \
npupp.h \
totemNPNGlue.cpp \
totemNPClass.cpp \
totemNPClass.h \
totemNPObject.cpp \
totemNPObject.h \
totemNPObjectWrapper.h \
totemNPVariantWrapper.h \
totemPluginGlue.cpp \
totemPlugin.cpp \
totemPlugin.h \
totem-plugin-viewer-constants.h
xplayerNPNGlue.cpp \
xplayerNPClass.cpp \
xplayerNPClass.h \
xplayerNPObject.cpp \
xplayerNPObject.h \
xplayerNPObjectWrapper.h \
xplayerNPVariantWrapper.h \
xplayerPluginGlue.cpp \
xplayerPlugin.cpp \
xplayerPlugin.h \
xplayer-plugin-viewer-constants.h

plugin_cxxflags = \
$(BROWSER_PLUGIN_CFLAGS) \
@@ -50,8 +50,8 @@ plugin_ldflags = \
noinst_PROGRAMS = test-glow-button

test_glow_button_SOURCES = \
totem-glow-button.c \
totem-glow-button.h \
xplayer-glow-button.c \
xplayer-glow-button.h \
test-glow-button.c

test_glow_button_LDADD = \
@@ -63,168 +63,168 @@ test_glow_button_CFLAGS = \
$(WARN_CFLAGS) \
$(AM_CFLAGS)

# Totem Plugin Viewer
libexec_PROGRAMS = totem-plugin-viewer
# Xplayer Plugin Viewer
libexec_PROGRAMS = xplayer-plugin-viewer

# Are we a bit thick, Mister?
totem-plugin-viewer.c: totem-plugin-viewer-interface.h $(MARSHAL_FILES)
totem_plugin_viewer_SOURCES = \
totem-glow-button.c \
totem-glow-button.h \
totem-plugin-viewer-interface.h \
totem-plugin-viewer.c \
totem-plugin-viewer-constants.h \
totem-plugin-viewer-options.h \
xplayer-plugin-viewer.c: xplayer-plugin-viewer-interface.h $(MARSHAL_FILES)
xplayer_plugin_viewer_SOURCES = \
xplayer-glow-button.c \
xplayer-glow-button.h \
xplayer-plugin-viewer-interface.h \
xplayer-plugin-viewer.c \
xplayer-plugin-viewer-constants.h \
xplayer-plugin-viewer-options.h \
$(MARSHAL_FILES)

totem_plugin_viewer_CPPFLAGS = \
xplayer_plugin_viewer_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DG_LOG_DOMAIN=\""TotemEmbedded\"" \
-DG_LOG_DOMAIN=\""XplayerEmbedded\"" \
-I$(top_srcdir)/src/gst \
$(AM_CPPFLAGS)

totem_plugin_viewer_CFLAGS = \
xplayer_plugin_viewer_CFLAGS = \
$(PLUGIN_VIEWER_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS)

totem_plugin_viewer_LDADD = \
xplayer_plugin_viewer_LDADD = \
$(top_builddir)/src/backend/libbaconvideowidget.la \
$(top_builddir)/src/libtotem_player.la \
$(top_builddir)/src/libxplayer_player.la \
$(PLUGIN_VIEWER_LIBS)

totem_plugin_viewer_LDFLAGS = -export-dynamic
xplayer_plugin_viewer_LDFLAGS = -export-dynamic

totem-plugin-viewer-interface.h: org_gnome_totem_PluginViewer.xml
$(DBUS_BIND) --prefix=totem_embedded --mode=glib-server $< > $@
xplayer-plugin-viewer-interface.h: org_gnome_xplayer_PluginViewer.xml
$(DBUS_BIND) --prefix=xplayer_embedded --mode=glib-server $< > $@

CLEANFILES = totem-plugin-viewer-interface.h
EXTRA_DIST += org_gnome_totem_PluginViewer.xml
CLEANFILES = xplayer-plugin-viewer-interface.h
EXTRA_DIST += org_gnome_xplayer_PluginViewer.xml

# Totem GMP Plugin
# Xplayer GMP Plugin
if ENABLE_GMP_PLUGIN
plugin_LTLIBRARIES += libtotem-gmp-plugin.la
plugin_LTLIBRARIES += libxplayer-gmp-plugin.la

libtotem_gmp_plugin_la_SOURCES = \
libxplayer_gmp_plugin_la_SOURCES = \
$(plugin_sources) \
totemGMPControls.cpp \
totemGMPControls.h \
totemGMPError.cpp \
totemGMPError.h \
totemGMPNetwork.cpp \
totemGMPNetwork.h \
totemGMPPlayer.cpp \
totemGMPPlayer.h \
totemGMPPlaylist.cpp \
totemGMPPlaylist.h \
totemGMPSettings.cpp \
totemGMPSettings.h
libtotem_gmp_plugin_la_CPPFLAGS = \
xplayerGMPControls.cpp \
xplayerGMPControls.h \
xplayerGMPError.cpp \
xplayerGMPError.h \
xplayerGMPNetwork.cpp \
xplayerGMPNetwork.h \
xplayerGMPPlayer.cpp \
xplayerGMPPlayer.h \
xplayerGMPPlaylist.cpp \
xplayerGMPPlaylist.h \
xplayerGMPSettings.cpp \
xplayerGMPSettings.h
libxplayer_gmp_plugin_la_CPPFLAGS = \
-DXP_UNIX \
-DMOZ_X11 \
-DTOTEM_GMP_PLUGIN \
-DTOTEM_PL_PARSER_MINI \
-DXPLAYER_GMP_PLUGIN \
-DXPLAYER_PL_PARSER_MINI \
$(AM_CPPFLAGS)

libtotem_gmp_plugin_la_CXXFLAGS = $(plugin_cxxflags)
libtotem_gmp_plugin_la_LIBADD = $(plugin_libadd)
libtotem_gmp_plugin_la_LDFLAGS = $(plugin_ldflags)
libxplayer_gmp_plugin_la_CXXFLAGS = $(plugin_cxxflags)
libxplayer_gmp_plugin_la_LIBADD = $(plugin_libadd)
libxplayer_gmp_plugin_la_LDFLAGS = $(plugin_ldflags)
endif

# Totem NarrowSpace Plugin
# Xplayer NarrowSpace Plugin
if ENABLE_NARROWSPACE_PLUGIN
plugin_LTLIBRARIES += libtotem-narrowspace-plugin.la
plugin_LTLIBRARIES += libxplayer-narrowspace-plugin.la

libtotem_narrowspace_plugin_la_SOURCES = \
libxplayer_narrowspace_plugin_la_SOURCES = \
$(plugin_sources) \
totemNarrowSpacePlugin.cpp \
totemNarrowSpacePlugin.h
xplayerNarrowSpacePlugin.cpp \
xplayerNarrowSpacePlugin.h

libtotem_narrowspace_plugin_la_CPPFLAGS = \
libxplayer_narrowspace_plugin_la_CPPFLAGS = \
-DXP_UNIX \
-DMOZ_X11 \
-DTOTEM_NARROWSPACE_PLUGIN \
-DTOTEM_PL_PARSER_MINI \
-DXPLAYER_NARROWSPACE_PLUGIN \
-DXPLAYER_PL_PARSER_MINI \
$(AM_CPPFLAGS)

libtotem_narrowspace_plugin_la_CXXFLAGS = $(plugin_cxxflags)
libtotem_narrowspace_plugin_la_LIBADD = $(plugin_libadd)
libtotem_narrowspace_plugin_la_LDFLAGS = $(plugin_ldflags)
libxplayer_narrowspace_plugin_la_CXXFLAGS = $(plugin_cxxflags)
libxplayer_narrowspace_plugin_la_LIBADD = $(plugin_libadd)
libxplayer_narrowspace_plugin_la_LDFLAGS = $(plugin_ldflags)
endif

# Totem Vegas Plugin
# Xplayer Vegas Plugin
if ENABLE_VEGAS_PLUGIN
plugin_LTLIBRARIES += libtotem-vegas-plugin.la
plugin_LTLIBRARIES += libxplayer-vegas-plugin.la

libtotem_vegas_plugin_la_SOURCES = \
libxplayer_vegas_plugin_la_SOURCES = \
$(plugin_sources) \
totemVegasPlugin.cpp \
totemVegasPlugin.h
xplayerVegasPlugin.cpp \
xplayerVegasPlugin.h

libtotem_vegas_plugin_la_CPPFLAGS = \
libxplayer_vegas_plugin_la_CPPFLAGS = \
-DXP_UNIX \
-DMOZ_X11 \
-DTOTEM_VEGAS_PLUGIN \
-DTOTEM_PL_PARSER_MINI \
-DXPLAYER_VEGAS_PLUGIN \
-DXPLAYER_PL_PARSER_MINI \
$(AM_CPPFLAGS)

libtotem_vegas_plugin_la_CXXFLAGS = $(plugin_cxxflags)
libtotem_vegas_plugin_la_LIBADD = $(plugin_libadd)
libtotem_vegas_plugin_la_LDFLAGS = $(plugin_ldflags)
libxplayer_vegas_plugin_la_CXXFLAGS = $(plugin_cxxflags)
libxplayer_vegas_plugin_la_LIBADD = $(plugin_libadd)
libxplayer_vegas_plugin_la_LDFLAGS = $(plugin_ldflags)
endif

# Totem MULLY Plugin
# Xplayer MULLY Plugin
if ENABLE_MULLY_PLUGIN
plugin_LTLIBRARIES += libtotem-mully-plugin.la
plugin_LTLIBRARIES += libxplayer-mully-plugin.la

libtotem_mully_plugin_la_SOURCES = \
libxplayer_mully_plugin_la_SOURCES = \
$(plugin_sources) \
totemMullYPlugin.cpp \
totemMullYPlugin.h
xplayerMullYPlugin.cpp \
xplayerMullYPlugin.h

libtotem_mully_plugin_la_CPPFLAGS = \
libxplayer_mully_plugin_la_CPPFLAGS = \
-DXP_UNIX \
-DMOZ_X11 \
-DTOTEM_MULLY_PLUGIN \
-DTOTEM_PL_PARSER_MINI \
-DXPLAYER_MULLY_PLUGIN \
-DXPLAYER_PL_PARSER_MINI \
$(AM_CPPFLAGS)

libtotem_mully_plugin_la_CXXFLAGS = $(plugin_cxxflags)
libtotem_mully_plugin_la_LIBADD = $(plugin_libadd)
libtotem_mully_plugin_la_LDFLAGS = $(plugin_ldflags)
libxplayer_mully_plugin_la_CXXFLAGS = $(plugin_cxxflags)
libxplayer_mully_plugin_la_LIBADD = $(plugin_libadd)
libxplayer_mully_plugin_la_LDFLAGS = $(plugin_ldflags)
endif

# Totem Cone Plugin
# Xplayer Cone Plugin
if ENABLE_CONE_PLUGIN
plugin_LTLIBRARIES += libtotem-cone-plugin.la
plugin_LTLIBRARIES += libxplayer-cone-plugin.la

libtotem_cone_plugin_la_SOURCES = \
libxplayer_cone_plugin_la_SOURCES = \
$(plugin_sources) \
totemConeAudio.cpp \
totemConeAudio.h \
totemCone.cpp \
totemCone.h \
totemConeInput.cpp \
totemConeInput.h \
totemConePlaylist.cpp \
totemConePlaylist.h \
totemConePlaylistItems.cpp \
totemConePlaylistItems.h \
totemConeVideo.cpp \
totemConeVideo.h
libtotem_cone_plugin_la_CPPFLAGS = \
xplayerConeAudio.cpp \
xplayerConeAudio.h \
xplayerCone.cpp \
xplayerCone.h \
xplayerConeInput.cpp \
xplayerConeInput.h \
xplayerConePlaylist.cpp \
xplayerConePlaylist.h \
xplayerConePlaylistItems.cpp \
xplayerConePlaylistItems.h \
xplayerConeVideo.cpp \
xplayerConeVideo.h
libxplayer_cone_plugin_la_CPPFLAGS = \
-DXP_UNIX \
-DMOZ_X11 \
-DTOTEM_CONE_PLUGIN \
-DTOTEM_PL_PARSER_MINI \
-DXPLAYER_CONE_PLUGIN \
-DXPLAYER_PL_PARSER_MINI \
$(AM_CPPFLAGS)

libtotem_cone_plugin_la_CXXFLAGS = $(plugin_cxxflags)
libtotem_cone_plugin_la_LIBADD = $(plugin_libadd)
libtotem_cone_plugin_la_LDFLAGS = $(plugin_ldflags)
libxplayer_cone_plugin_la_CXXFLAGS = $(plugin_cxxflags)
libxplayer_cone_plugin_la_LIBADD = $(plugin_libadd)
libxplayer_cone_plugin_la_LDFLAGS = $(plugin_ldflags)
endif

-include $(top_srcdir)/git.mk

+ 537
- 537
browser-plugin/Makefile.in
File diff suppressed because it is too large
View File


+ 8
- 8
browser-plugin/README.browser-plugin View File

@@ -5,15 +5,15 @@ Notes on the plugin's internals
Envars of interest
===================

export TOTEM_EMBEDDED_DEBUG_SYNC=1
- Pass --sync to the totem-plugin-viewer
export XPLAYER_EMBEDDED_DEBUG_SYNC=1
- Pass --sync to the xplayer-plugin-viewer

export TOTEM_EMBEDDED_DEBUG_FATAL=1
- Pass --g-fatal-warnings to the totem-plugin-viewer
export XPLAYER_EMBEDDED_DEBUG_FATAL=1
- Pass --g-fatal-warnings to the xplayer-plugin-viewer

export TOTEM_EMBEDDED_GDB=1
export XPLAYER_EMBEDDED_GDB=1
- Launch a gdb session inside an xterm to capture crashes and errors
from the totem-plugin-viewer
from the xplayer-plugin-viewer

export MOZ_PLUGIN_PATH=`pwd`
- Mozilla/Gecko/Firefox envar to lookup the browser plugins in the current
@@ -23,9 +23,9 @@ Disabling specific mime-types
=============================

This can be achieved using 2 files. They are:
/etc/totem/browser-plugins.ini ($(sysconfdir)/totem/browser-plugins.ini)
/etc/xplayer/browser-plugins.ini ($(sysconfdir)/xplayer/browser-plugins.ini)
and
~/.config/totem/browser-plugins.ini
~/.config/xplayer/browser-plugins.ini

The format is:
[Plugins]


+ 3
- 3
browser-plugin/org_gnome_totem_PluginViewer.xml View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>

<node name="/org/gnome/totem/PluginViewer">
<interface name="org.gnome.totem.PluginViewer">
<node name="/org/gnome/xplayer/PluginViewer">
<interface name="org.gnome.xplayer.PluginViewer">
<method name="DoCommand">
<arg type="s" name="Command" direction="in" />
</method>
@@ -23,7 +23,7 @@
</method>
<method name="CloseStream" />
<method name="OpenURI">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="totem_embedded_open_uri" />
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="xplayer_embedded_open_uri" />
<arg type="s" name="URI" direction="in" />
<arg type="s" name="BaseURI" direction="in" />
</method>


+ 7
- 7
browser-plugin/test-glow-button.c View File

@@ -1,15 +1,15 @@

#include <gtk/gtk.h>
#include "totem-glow-button.h"
#include "xplayer-glow-button.h"

#if 1
static gboolean
idle_cb (gpointer data)
{
TotemGlowButton *button = data;
XplayerGlowButton *button = data;

g_message ("launching the glow");
totem_glow_button_set_glow (button, TRUE);
xplayer_glow_button_set_glow (button, TRUE);

return FALSE;
}
@@ -18,10 +18,10 @@ idle_cb (gpointer data)
static gboolean
idle_un_cb (gpointer data)
{
TotemGlowButton *button = data;
XplayerGlowButton *button = data;

g_message ("stopping the glow");
totem_glow_button_set_glow (button, FALSE);
xplayer_glow_button_set_glow (button, FALSE);

return FALSE;
}
@@ -33,7 +33,7 @@ int main (int argc, char **argv)
gtk_init (&argc, &argv);

window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
button = totem_glow_button_new ();
button = xplayer_glow_button_new ();
image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU);
gtk_button_set_image (GTK_BUTTON (button), image);
#if 0
@@ -42,7 +42,7 @@ int main (int argc, char **argv)
#endif
gtk_container_add (GTK_CONTAINER(window), button);

totem_glow_button_set_glow (TOTEM_GLOW_BUTTON (button), TRUE);
xplayer_glow_button_set_glow (XPLAYER_GLOW_BUTTON (button), TRUE);

g_timeout_add_seconds (3, idle_cb, button);
g_timeout_add_seconds (5, idle_un_cb, button);


+ 45
- 45
browser-plugin/totem-glow-button.c View File

@@ -29,13 +29,13 @@

#include <math.h>
#include <gtk/gtk.h>
#include "totem-glow-button.h"
#include "xplayer-glow-button.h"

#define FADE_OPACITY_DEFAULT 0.6
#define ENTER_SPEEDUP_RATIO 0.4
#define FADE_MAX_LOOPS 4

struct _TotemGlowButton {
struct _XplayerGlowButton {
GtkButton parent;

gdouble glow_start_time;
@@ -51,14 +51,14 @@ struct _TotemGlowButton {
guint anim_finished :1;
};

static void totem_glow_button_set_timeout (TotemGlowButton *button, gboolean set_timeout);
static void xplayer_glow_button_set_timeout (XplayerGlowButton *button, gboolean set_timeout);

static GtkButtonClass *parent_class;

G_DEFINE_TYPE (TotemGlowButton, totem_glow_button, GTK_TYPE_BUTTON);
G_DEFINE_TYPE (XplayerGlowButton, xplayer_glow_button, GTK_TYPE_BUTTON);

static gboolean
totem_glow_button_glow (TotemGlowButton *button)
xplayer_glow_button_glow (XplayerGlowButton *button)
{
GtkWidget *buttonw;
GTimeVal tv;
@@ -111,30 +111,30 @@ totem_glow_button_glow (TotemGlowButton *button)
gtk_widget_queue_draw (GTK_WIDGET (button));

if (button->anim_finished != FALSE)
totem_glow_button_set_timeout (button, FALSE);
xplayer_glow_button_set_timeout (button, FALSE);

return button->anim_enabled;
}

static void
totem_glow_button_clear_glow_start_timeout_id (TotemGlowButton *button)
xplayer_glow_button_clear_glow_start_timeout_id (XplayerGlowButton *button)
{
button->button_glow = 0;
}

static gboolean
totem_glow_button_draw (GtkWidget *widget,
xplayer_glow_button_draw (GtkWidget *widget,
cairo_t *cr,
gpointer user_data)
{
TotemGlowButton *button;
XplayerGlowButton *button;
GtkStyleContext *context;
GtkAllocation allocation, child_allocation;
gint width, height;
GtkWidget *child;
GdkRGBA acolor;

button = TOTEM_GLOW_BUTTON (widget);
button = XPLAYER_GLOW_BUTTON (widget);

if (button->glow_factor == 0.0)
return FALSE;
@@ -176,25 +176,25 @@ totem_glow_button_draw (GtkWidget *widget,
}

static void
totem_glow_button_map (GtkWidget *buttonw)
xplayer_glow_button_map (GtkWidget *buttonw)
{
TotemGlowButton *button;
XplayerGlowButton *button;

(* GTK_WIDGET_CLASS (parent_class)->map) (buttonw);

button = TOTEM_GLOW_BUTTON (buttonw);
button = XPLAYER_GLOW_BUTTON (buttonw);

if (button->glow != FALSE && button->button_glow == 0) {
totem_glow_button_set_glow (button, TRUE);
xplayer_glow_button_set_glow (button, TRUE);
}
}

static void
totem_glow_button_unmap (GtkWidget *buttonw)
xplayer_glow_button_unmap (GtkWidget *buttonw)
{
TotemGlowButton *button;
XplayerGlowButton *button;

button = TOTEM_GLOW_BUTTON (buttonw);
button = XPLAYER_GLOW_BUTTON (buttonw);

if (button->button_glow > 0) {
g_source_remove (button->button_glow);
@@ -205,26 +205,26 @@ totem_glow_button_unmap (GtkWidget *buttonw)
}

static void
totem_glow_button_enter (GtkButton *buttonw)
xplayer_glow_button_enter (GtkButton *buttonw)
{
TotemGlowButton *button;
XplayerGlowButton *button;

button = TOTEM_GLOW_BUTTON (buttonw);
button = XPLAYER_GLOW_BUTTON (buttonw);

(* GTK_BUTTON_CLASS (parent_class)->enter) (buttonw);

button->pointer_entered = TRUE;
button->anim_finished = FALSE;
button->glow_start_time = G_MINDOUBLE;
totem_glow_button_set_timeout (button, FALSE);
xplayer_glow_button_set_timeout (button, FALSE);
}

static void
totem_glow_button_leave (GtkButton *buttonw)
xplayer_glow_button_leave (GtkButton *buttonw)
{
TotemGlowButton *button;
XplayerGlowButton *button;

button = TOTEM_GLOW_BUTTON (buttonw);
button = XPLAYER_GLOW_BUTTON (buttonw);

(* GTK_BUTTON_CLASS (parent_class)->leave) (buttonw);

@@ -232,21 +232,21 @@ totem_glow_button_leave (GtkButton *buttonw)
button->glow_start_time = G_MINDOUBLE;
button->anim_finished = FALSE;
if (button->glow != FALSE)
totem_glow_button_set_timeout (button, TRUE);
xplayer_glow_button_set_timeout (button, TRUE);
}

static void
totem_glow_button_finalize (GObject *object)
xplayer_glow_button_finalize (GObject *object)
{
TotemGlowButton *button = TOTEM_GLOW_BUTTON (object);
XplayerGlowButton *button = XPLAYER_GLOW_BUTTON (object);

totem_glow_button_set_glow (button, FALSE);
xplayer_glow_button_set_glow (button, FALSE);

G_OBJECT_CLASS (parent_class)->finalize (object);
}

static void
totem_glow_button_class_init (TotemGlowButtonClass *klass)
xplayer_glow_button_class_init (XplayerGlowButtonClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
@@ -254,38 +254,38 @@ totem_glow_button_class_init (TotemGlowButtonClass *klass)

parent_class = g_type_class_peek_parent (klass);

object_class->finalize = totem_glow_button_finalize;
object_class->finalize = xplayer_glow_button_finalize;
/* Note that we don't use a draw here because we
* want to modify what the button will draw by itself */
widget_class->map = totem_glow_button_map;
widget_class->unmap = totem_glow_button_unmap;
button_class->enter = totem_glow_button_enter;
button_class->leave = totem_glow_button_leave;
widget_class->map = xplayer_glow_button_map;
widget_class->unmap = xplayer_glow_button_unmap;
button_class->enter = xplayer_glow_button_enter;
button_class->leave = xplayer_glow_button_leave;
}

static void
totem_glow_button_init (TotemGlowButton *button)
xplayer_glow_button_init (XplayerGlowButton *button)
{
button->glow_start_time = 0.0;
button->button_glow = 0;
button->glow_factor = 0.0;

g_signal_connect_object (button, "draw",
G_CALLBACK (totem_glow_button_draw),
G_CALLBACK (xplayer_glow_button_draw),
G_OBJECT (button),
G_CONNECT_AFTER);
}

GtkWidget *
totem_glow_button_new (void)
xplayer_glow_button_new (void)
{
return g_object_new (TOTEM_TYPE_GLOW_BUTTON, NULL);
return g_object_new (XPLAYER_TYPE_GLOW_BUTTON, NULL);
}

/* We can only add a timeout once, we assert that, though
* calling it multiple times to disable the animation is fine */
static void
totem_glow_button_set_timeout (TotemGlowButton *button, gboolean set_timeout)
xplayer_glow_button_set_timeout (XplayerGlowButton *button, gboolean set_timeout)
{
if (set_timeout != FALSE) {
if (button->button_glow > 0)
@@ -300,8 +300,8 @@ totem_glow_button_set_timeout (TotemGlowButton *button, gboolean set_timeout)
button->button_glow =
g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
100,
(GSourceFunc) totem_glow_button_glow, button,
(GDestroyNotify) totem_glow_button_clear_glow_start_timeout_id);
(GSourceFunc) xplayer_glow_button_glow, button,
(GDestroyNotify) xplayer_glow_button_clear_glow_start_timeout_id);
} else {
if (button->button_glow > 0) {
g_source_remove (button->button_glow);
@@ -313,12 +313,12 @@ totem_glow_button_set_timeout (TotemGlowButton *button, gboolean set_timeout)
}

void
totem_glow_button_set_glow (TotemGlowButton *button, gboolean glow)
xplayer_glow_button_set_glow (XplayerGlowButton *button, gboolean glow)
{
GtkSettings *settings;
gboolean anim_enabled;

g_return_if_fail (TOTEM_IS_GLOW_BUTTON (button));
g_return_if_fail (XPLAYER_IS_GLOW_BUTTON (button));

if (gtk_widget_get_mapped (GTK_WIDGET (button)) == FALSE
&& glow != FALSE) {
@@ -340,11 +340,11 @@ totem_glow_button_set_glow (TotemGlowButton *button, gboolean glow)

button->glow = glow;

totem_glow_button_set_timeout (button, glow);
xplayer_glow_button_set_timeout (button, glow);
}

gboolean
totem_glow_button_get_glow (TotemGlowButton *button)
xplayer_glow_button_get_glow (XplayerGlowButton *button)
{
return button->glow != FALSE;
}


+ 13
- 13
browser-plugin/totem-glow-button.h View File

@@ -22,31 +22,31 @@
* Boston, MA 02110-1301 USA.
*/

#ifndef __TOTEM_GLOW_BUTTON_H__
#define __TOTEM_GLOW_BUTTON_H__
#ifndef __XPLAYER_GLOW_BUTTON_H__
#define __XPLAYER_GLOW_BUTTON_H__

#include <gtk/gtk.h>

G_BEGIN_DECLS

#define TOTEM_TYPE_GLOW_BUTTON (totem_glow_button_get_type ())
#define TOTEM_GLOW_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_GLOW_BUTTON, TotemGlowButton))
#define TOTEM_IS_GLOW_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_GLOW_BUTTON))
#define XPLAYER_TYPE_GLOW_BUTTON (xplayer_glow_button_get_type ())
#define XPLAYER_GLOW_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XPLAYER_TYPE_GLOW_BUTTON, XplayerGlowButton))
#define XPLAYER_IS_GLOW_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XPLAYER_TYPE_GLOW_BUTTON))

typedef struct _TotemGlowButton TotemGlowButton;
typedef struct _XplayerGlowButton XplayerGlowButton;

typedef struct _TotemGlowButtonClass {
typedef struct _XplayerGlowButtonClass {
GtkButtonClass parent_class;

gpointer __bla[4];
} TotemGlowButtonClass;
} XplayerGlowButtonClass;

GType totem_glow_button_get_type (void) G_GNUC_CONST;
GType xplayer_glow_button_get_type (void) G_GNUC_CONST;

GtkWidget * totem_glow_button_new (void);
void totem_glow_button_set_glow (TotemGlowButton *button, gboolean glow);
gboolean totem_glow_button_get_glow (TotemGlowButton *button);
GtkWidget * xplayer_glow_button_new (void);
void xplayer_glow_button_set_glow (XplayerGlowButton *button, gboolean glow);
gboolean xplayer_glow_button_get_glow (XplayerGlowButton *button);

G_END_DECLS

#endif /* __TOTEM_GLOW_BUTTON_H__ */
#endif /* __XPLAYER_GLOW_BUTTON_H__ */

+ 15
- 15
browser-plugin/totem-plugin-viewer-constants.h View File

@@ -1,4 +1,4 @@
/* Totem Plugin Viewer constants
/* Xplayer Plugin Viewer constants
*
* Copyright © 2006 Christian Persch
* Copyright © 2007 Bastien Nocera <hadess@hadess.net>
@@ -19,28 +19,28 @@
* Boston, MA 02110-1301 USA.
*/

#ifndef __TOTEM_PLUGIN_VIEWER_CONSTANTS__
#define __TOTEM_PLUGIN_VIEWER_CONSTANTS__
#ifndef __XPLAYER_PLUGIN_VIEWER_CONSTANTS__
#define __XPLAYER_PLUGIN_VIEWER_CONSTANTS__

#define TOTEM_COMMAND_PLAY "Play"
#define TOTEM_COMMAND_PAUSE "Pause"
#define TOTEM_COMMAND_STOP "Stop"
#define XPLAYER_COMMAND_PLAY "Play"
#define XPLAYER_COMMAND_PAUSE "Pause"
#define XPLAYER_COMMAND_STOP "Stop"

typedef enum {
TOTEM_STATE_PLAYING,
TOTEM_STATE_PAUSED,
TOTEM_STATE_STOPPED,
TOTEM_STATE_INVALID
} TotemStates;
XPLAYER_STATE_PLAYING,
XPLAYER_STATE_PAUSED,
XPLAYER_STATE_STOPPED,
XPLAYER_STATE_INVALID
} XplayerStates;

static const char *totem_states[] = {
static const char *xplayer_states[] = {
"PLAYING",
"PAUSED",
"STOPPED",
"INVALID"
};

#define TOTEM_PROPERTY_VOLUME "volume"
#define TOTEM_PROPERTY_ISFULLSCREEN "is-fullscreen"
#define XPLAYER_PROPERTY_VOLUME "volume"
#define XPLAYER_PROPERTY_ISFULLSCREEN "is-fullscreen"

#endif /* !__TOTEM_PLUGIN_VIEWER_CONSTANTS__ */
#endif /* !__XPLAYER_PLUGIN_VIEWER_CONSTANTS__ */

+ 50
- 50
browser-plugin/totem-plugin-viewer-interface.h View File

@@ -1,8 +1,8 @@
/* Generated by dbus-binding-tool; do not edit! */


#ifndef __dbus_glib_marshal_totem_embedded_MARSHAL_H__
#define __dbus_glib_marshal_totem_embedded_MARSHAL_H__
#ifndef __dbus_glib_marshal_xplayer_embedded_MARSHAL_H__
#define __dbus_glib_marshal_xplayer_embedded_MARSHAL_H__

#include <glib-object.h>

@@ -56,14 +56,14 @@ G_BEGIN_DECLS


/* BOOLEAN:STRING,STRING,STRING,STRING,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_STRING_STRING_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_STRING_STRING_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_STRING_STRING_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_STRING_STRING_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -109,14 +109,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_STRING_STRING_POINTER (G
}

/* BOOLEAN:INT64,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__INT64_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__INT64_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__INT64_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__INT64_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -156,14 +156,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__INT64_POINTER (GClosure *closure,
}

/* BOOLEAN:STRING,UINT,INT,INT,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_UINT_INT_INT_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_UINT_INT_INT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_UINT_INT_INT_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_UINT_INT_INT_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -209,14 +209,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_UINT_INT_INT_POINTER (GClosure
}

/* BOOLEAN:POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -254,14 +254,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__POINTER (GClosure *closure,
}

/* BOOLEAN:DOUBLE,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__DOUBLE_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__DOUBLE_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__DOUBLE_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__DOUBLE_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -301,14 +301,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__DOUBLE_POINTER (GClosure *closure,
}

/* BOOLEAN:STRING,STRING,STRING,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_STRING_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_STRING_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_STRING_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_STRING_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -352,14 +352,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_STRING_POINTER (GClosure
}

/* BOOLEAN:STRING,UINT,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_UINT_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_UINT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_UINT_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_UINT_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -401,14 +401,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_UINT_POINTER (GClosure *clo
}

/* BOOLEAN:UINT64,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__UINT64_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__UINT64_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__UINT64_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__UINT64_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -448,14 +448,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__UINT64_POINTER (GClosure *closure,
}

/* BOOLEAN:UINT,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__UINT_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__UINT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__UINT_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__UINT_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -495,14 +495,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__UINT_POINTER (GClosure *closure,
}

/* BOOLEAN:STRING,STRING,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -544,14 +544,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_POINTER (GClosure *c
}

/* BOOLEAN:STRING,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -591,14 +591,14 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_POINTER (GClosure *closure,
}

/* BOOLEAN:BOOLEAN,POINTER */
extern void dbus_glib_marshal_totem_embedded_BOOLEAN__BOOLEAN_POINTER (GClosure *closure,
extern void dbus_glib_marshal_xplayer_embedded_BOOLEAN__BOOLEAN_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
void
dbus_glib_marshal_totem_embedded_BOOLEAN__BOOLEAN_POINTER (GClosure *closure,
dbus_glib_marshal_xplayer_embedded_BOOLEAN__BOOLEAN_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
@@ -639,35 +639,35 @@ dbus_glib_marshal_totem_embedded_BOOLEAN__BOOLEAN_POINTER (GClosure *closure

G_END_DECLS

#endif /* __dbus_glib_marshal_totem_embedded_MARSHAL_H__ */
#endif /* __dbus_glib_marshal_xplayer_embedded_MARSHAL_H__ */

#include <dbus/dbus-glib.h>
static const DBusGMethodInfo dbus_glib_totem_embedded_methods[] = {
{ (GCallback) totem_embedded_do_command, dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_POINTER, 0 },
{ (GCallback) totem_embedded_set_window, dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_UINT_INT_INT_POINTER, 54 },
{ (GCallback) totem_embedded_unset_window, dbus_glib_marshal_totem_embedded_BOOLEAN__UINT_POINTER, 138 },
{ (GCallback) totem_embedded_setup_stream, dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_POINTER, 190 },
{ (GCallback) totem_embedded_open_stream, dbus_glib_marshal_totem_embedded_BOOLEAN__INT64_POINTER, 254 },
{ (GCallback) totem_embedded_close_stream, dbus_glib_marshal_totem_embedded_BOOLEAN__POINTER, 306 },
{ (GCallback) totem_embedded_open_uri, dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_POINTER, 350 },
{ (GCallback) totem_embedded_set_playlist, dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_STRING_POINTER, 410 },
{ (GCallback) totem_embedded_set_local_file, dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_STRING_POINTER, 483 },
{ (GCallback) totem_embedded_set_local_cache, dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_POINTER, 557 },
{ (GCallback) totem_embedded_set_href, dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_POINTER, 612 },
{ (GCallback) totem_embedded_set_error_logo, dbus_glib_marshal_totem_embedded_BOOLEAN__POINTER, 675 },
{ (GCallback) totem_embedded_launch_player, dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_UINT_POINTER, 720 },
{ (GCallback) totem_embedded_set_volume, dbus_glib_marshal_totem_embedded_BOOLEAN__DOUBLE_POINTER, 782 },
{ (GCallback) totem_embedded_clear_playlist, dbus_glib_marshal_totem_embedded_BOOLEAN__POINTER, 835 },
{ (GCallback) totem_embedded_add_item, dbus_glib_marshal_totem_embedded_BOOLEAN__STRING_STRING_STRING_STRING_POINTER, 881 },
{ (GCallback) totem_embedded_set_fullscreen, dbus_glib_marshal_totem_embedded_BOOLEAN__BOOLEAN_POINTER, 964 },
{ (GCallback) totem_embedded_set_time, dbus_glib_marshal_totem_embedded_BOOLEAN__UINT64_POINTER, 1032 },
static const DBusGMethodInfo dbus_glib_xplayer_embedded_methods[] = {
{ (GCallback) xplayer_embedded_do_command, dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_POINTER, 0 },
{ (GCallback) xplayer_embedded_set_window, dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_UINT_INT_INT_POINTER, 54 },
{ (GCallback) xplayer_embedded_unset_window, dbus_glib_marshal_xplayer_embedded_BOOLEAN__UINT_POINTER, 138 },
{ (GCallback) xplayer_embedded_setup_stream, dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_POINTER, 190 },
{ (GCallback) xplayer_embedded_open_stream, dbus_glib_marshal_xplayer_embedded_BOOLEAN__INT64_POINTER, 254 },
{ (GCallback) xplayer_embedded_close_stream, dbus_glib_marshal_xplayer_embedded_BOOLEAN__POINTER, 306 },
{ (GCallback) xplayer_embedded_open_uri, dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_POINTER, 350 },
{ (GCallback) xplayer_embedded_set_playlist, dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_STRING_POINTER, 410 },
{ (GCallback) xplayer_embedded_set_local_file, dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_STRING_POINTER, 483 },
{ (GCallback) xplayer_embedded_set_local_cache, dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_POINTER, 557 },
{ (GCallback) xplayer_embedded_set_href, dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_POINTER, 612 },
{ (GCallback) xplayer_embedded_set_error_logo, dbus_glib_marshal_xplayer_embedded_BOOLEAN__POINTER, 675 },
{ (GCallback) xplayer_embedded_launch_player, dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_UINT_POINTER, 720 },
{ (GCallback) xplayer_embedded_set_volume, dbus_glib_marshal_xplayer_embedded_BOOLEAN__DOUBLE_POINTER, 782 },
{ (GCallback) xplayer_embedded_clear_playlist, dbus_glib_marshal_xplayer_embedded_BOOLEAN__POINTER, 835 },
{ (GCallback) xplayer_embedded_add_item, dbus_glib_marshal_xplayer_embedded_BOOLEAN__STRING_STRING_STRING_STRING_POINTER, 881 },
{ (GCallback) xplayer_embedded_set_fullscreen, dbus_glib_marshal_xplayer_embedded_BOOLEAN__BOOLEAN_POINTER, 964 },
{ (GCallback) xplayer_embedded_set_time, dbus_glib_marshal_xplayer_embedded_BOOLEAN__UINT64_POINTER, 1032 },
};

const DBusGObjectInfo dbus_glib_totem_embedded_object_info = { 1,
dbus_glib_totem_embedded_methods,
const DBusGObjectInfo dbus_glib_xplayer_embedded_object_info = { 1,
dbus_glib_xplayer_embedded_methods,
18,
"org.gnome.totem.PluginViewer\0DoCommand\0S\0Command\0I\0s\0\0org.gnome.totem.PluginViewer\0SetWindow\0S\0Controls\0I\0s\0XID\0I\0u\0Width\0I\0i\0Height\0I\0i\0\0org.gnome.totem.PluginViewer\0UnsetWindow\0S\0XID\0I\0u\0\0org.gnome.totem.PluginViewer\0SetupStream\0S\0URI\0I\0s\0BaseURI\0I\0s\0\0org.gnome.totem.PluginViewer\0OpenStream\0S\0Size\0I\0x\0\0org.gnome.totem.PluginViewer\0CloseStream\0S\0\0org.gnome.totem.PluginViewer\0OpenURI\0S\0URI\0I\0s\0BaseURI\0I\0s\0\0org.gnome.totem.PluginViewer\0SetPlaylist\0S\0Path\0I\0s\0URI\0I\0s\0BaseURI\0I\0s\0\0org.gnome.totem.PluginViewer\0SetLocalFile\0S\0Path\0I\0s\0URI\0I\0s\0BaseURI\0I\0s\0\0org.gnome.totem.PluginViewer\0SetLocalCache\0S\0Path\0I\0s\0\0org.gnome.totem.PluginViewer\0SetHref\0S\0HrefURI\0I\0s\0Target\0I\0s\0\0org.gnome.totem.PluginViewer\0SetErrorLogo\0S\0\0org.gnome.totem.PluginViewer\0LaunchPlayer\0S\0URI\0I\0s\0Time\0I\0u\0\0org.gnome.totem.PluginViewer\0SetVolume\0S\0Volume\0I\0d\0\0org.gnome.totem.PluginViewer\0ClearPlaylist\0S\0\0org.gnome.totem.PluginViewer\0AddItem\0S\0BaseURI\0I\0s\0URI\0I\0s\0Title\0I\0s\0Subtitle\0I\0s\0\0org.gnome.totem.PluginViewer\0SetFullscreen\0S\0FullscreenEnabled\0I\0b\0\0org.gnome.totem.PluginViewer\0SetTime\0S\0Time\0I\0t\0\0\0",
"org.gnome.totem.PluginViewer\0ButtonPress\0org.gnome.totem.PluginViewer\0Tick\0org.gnome.totem.PluginViewer\0PropertyChange\0org.gnome.totem.PluginViewer\0StartStream\0org.gnome.totem.PluginViewer\0StopStream\0\0",
"org.gnome.xplayer.PluginViewer\0DoCommand\0S\0Command\0I\0s\0\0org.gnome.xplayer.PluginViewer\0SetWindow\0S\0Controls\0I\0s\0XID\0I\0u\0Width\0I\0i\0Height\0I\0i\0\0org.gnome.xplayer.PluginViewer\0UnsetWindow\0S\0XID\0I\0u\0\0org.gnome.xplayer.PluginViewer\0SetupStream\0S\0URI\0I\0s\0BaseURI\0I\0s\0\0org.gnome.xplayer.PluginViewer\0OpenStream\0S\0Size\0I\0x\0\0org.gnome.xplayer.PluginViewer\0CloseStream\0S\0\0org.gnome.xplayer.PluginViewer\0OpenURI\0S\0URI\0I\0s\0BaseURI\0I\0s\0\0org.gnome.xplayer.PluginViewer\0SetPlaylist\0S\0Path\0I\0s\0URI\0I\0s\0BaseURI\0I\0s\0\0org.gnome.xplayer.PluginViewer\0SetLocalFile\0S\0Path\0I\0s\0URI\0I\0s\0BaseURI\0I\0s\0\0org.gnome.xplayer.PluginViewer\0SetLocalCache\0S\0Path\0I\0s\0\0org.gnome.xplayer.PluginViewer\0SetHref\0S\0HrefURI\0I\0s\0Target\0I\0s\0\0org.gnome.xplayer.PluginViewer\0SetErrorLogo\0S\0\0org.gnome.xplayer.PluginViewer\0LaunchPlayer\0S\0URI\0I\0s\0Time\0I\0u\0\0org.gnome.xplayer.PluginViewer\0SetVolume\0S\0Volume\0I\0d\0\0org.gnome.xplayer.PluginViewer\0ClearPlaylist\0S\0\0org.gnome.xplayer.PluginViewer\0AddItem\0S\0BaseURI\0I\0s\0URI\0I\0s\0Title\0I\0s\0Subtitle\0I\0s\0\0org.gnome.xplayer.PluginViewer\0SetFullscreen\0S\0FullscreenEnabled\0I\0b\0\0org.gnome.xplayer.PluginViewer\0SetTime\0S\0Time\0I\0t\0\0\0",
"org.gnome.xplayer.PluginViewer\0ButtonPress\0org.gnome.xplayer.PluginViewer\0Tick\0org.gnome.xplayer.PluginViewer\0PropertyChange\0org.gnome.xplayer.PluginViewer\0StartStream\0org.gnome.xplayer.PluginViewer\0StopStream\0\0",
"\0"
};


+ 19
- 19
browser-plugin/totem-plugin-viewer-options.h View File

@@ -1,4 +1,4 @@
/* Totem Plugin Viewer options
/* Xplayer Plugin Viewer options
*
* Copyright © 2005 Bastien Nocera <hadess@hadess.net>
*
@@ -18,24 +18,24 @@
* Boston, MA 02110-1301 USA.
*/

#ifndef __TOTEM_PLUGIN_VIEWER_OPTIONS_H__
#define __TOTEM_PLUGIN_VIEWER_OPTIONS_H__
#ifndef __XPLAYER_PLUGIN_VIEWER_OPTIONS_H__
#define __XPLAYER_PLUGIN_VIEWER_OPTIONS_H__

#define TOTEM_PLUGIN_VIEWER_INTERFACE_NAME "org.gnome.totem.PluginViewer"
#define TOTEM_PLUGIN_VIEWER_NAME_TEMPLATE "org.gnome.totem.PluginViewer_%d"
#define TOTEM_PLUGIN_VIEWER_DBUS_PATH "/org/gnome/totem/PluginViewer"
#define XPLAYER_PLUGIN_VIEWER_INTERFACE_NAME "org.gnome.xplayer.PluginViewer"
#define XPLAYER_PLUGIN_VIEWER_NAME_TEMPLATE "org.gnome.xplayer.PluginViewer_%d"
#define XPLAYER_PLUGIN_VIEWER_DBUS_PATH "/org/gnome/xplayer/PluginViewer"

#define TOTEM_OPTION_BASE_URI "base-uri"
#define TOTEM_OPTION_CONTROLS_HIDDEN "no-controls"
#define TOTEM_OPTION_HIDDEN "hidden"
#define TOTEM_OPTION_MIMETYPE "mimetype"
#define TOTEM_OPTION_NOAUTOSTART "no-autostart"
#define TOTEM_OPTION_PLAYLIST "playlist"
#define TOTEM_OPTION_PLUGIN_TYPE "plugin-type"
#define TOTEM_OPTION_REPEAT "repeat"
#define TOTEM_OPTION_USER_AGENT "user-agent"
#define TOTEM_OPTION_STATUSBAR "statusbar"
#define TOTEM_OPTION_AUDIOONLY "audio-only"
#define TOTEM_OPTION_REFERRER "referrer"
#define XPLAYER_OPTION_BASE_URI "base-uri"
#define XPLAYER_OPTION_CONTROLS_HIDDEN "no-controls"
#define XPLAYER_OPTION_HIDDEN "hidden"
#define XPLAYER_OPTION_MIMETYPE "mimetype"
#define XPLAYER_OPTION_NOAUTOSTART "no-autostart"
#define XPLAYER_OPTION_PLAYLIST "playlist"
#define XPLAYER_OPTION_PLUGIN_TYPE "plugin-type"
#define XPLAYER_OPTION_REPEAT "repeat"
#define XPLAYER_OPTION_USER_AGENT "user-agent"
#define XPLAYER_OPTION_STATUSBAR "statusbar"
#define XPLAYER_OPTION_AUDIOONLY "audio-only"
#define XPLAYER_OPTION_REFERRER "referrer"

#endif /* !__TOTEM_PLUGIN_VIEWER_OPTIONS_H__ */
#endif /* !__XPLAYER_PLUGIN_VIEWER_OPTIONS_H__ */

+ 360
- 360
browser-plugin/totem-plugin-viewer.c
File diff suppressed because it is too large
View File


+ 21
- 21
browser-plugin/totemCone.cpp View File

@@ -1,4 +1,4 @@
/* Totem Cone plugin
/* Xplayer Cone plugin
*
* Copyright © 2004 Bastien Nocera <hadess@hadess.net>
* Copyright © 2002 David A. Schleef <ds@schleef.org>
@@ -26,8 +26,8 @@

#include <glib.h>

#include "totemPlugin.h"
#include "totemCone.h"
#include "xplayerPlugin.h"
#include "xplayerCone.h"

static const char *propertyNames[] = {
"audio",
@@ -44,29 +44,29 @@ static const char *methodNames[] = {
"versionInfo"
};

TOTEM_IMPLEMENT_NPCLASS (totemCone,
XPLAYER_IMPLEMENT_NPCLASS (xplayerCone,
propertyNames, G_N_ELEMENTS (propertyNames),
methodNames, G_N_ELEMENTS (methodNames),
NULL);

totemCone::totemCone (NPP aNPP)
: totemNPObject (aNPP)
xplayerCone::xplayerCone (NPP aNPP)
: xplayerNPObject (aNPP)
{
TOTEM_LOG_CTOR ();
XPLAYER_LOG_CTOR ();
}

totemCone::~totemCone ()
xplayerCone::~xplayerCone ()
{
TOTEM_LOG_DTOR ();
XPLAYER_LOG_DTOR ();
}

bool
totemCone::InvokeByIndex (int aIndex,
xplayerCone::InvokeByIndex (int aIndex,
const NPVariant *argv,
uint32_t argc,
NPVariant *_result)
{
TOTEM_LOG_INVOKE (aIndex, totemCone);
XPLAYER_LOG_INVOKE (aIndex, xplayerCone);

switch (Methods (aIndex)) {
case eversionInfo:
@@ -77,31 +77,31 @@ totemCone::InvokeByIndex (int aIndex,
}

bool
totemCone::GetPropertyByIndex (int aIndex,
xplayerCone::GetPropertyByIndex (int aIndex,
NPVariant *_result)
{
TOTEM_LOG_GETTER (aIndex, totemCone);
XPLAYER_LOG_GETTER (aIndex, xplayerCone);

switch (Properties (aIndex)) {
case eAudio:
return ObjectVariant (_result, Plugin()->GetNPObject (totemPlugin::eConeAudio));
return ObjectVariant (_result, Plugin()->GetNPObject (xplayerPlugin::eConeAudio));

case eInput:
return ObjectVariant (_result, Plugin()->GetNPObject (totemPlugin::eConeInput));
return ObjectVariant (_result, Plugin()->GetNPObject (xplayerPlugin::eConeInput));

case ePlaylist:
return ObjectVariant (_result, Plugin()->GetNPObject (totemPlugin::eConePlaylist));
return ObjectVariant (_result, Plugin()->GetNPObject (xplayerPlugin::eConePlaylist));

case eVideo:
return ObjectVariant (_result, Plugin()->GetNPObject (totemPlugin::eConeVideo));
return ObjectVariant (_result, Plugin()->GetNPObject (xplayerPlugin::eConeVideo));

case eVersionInfo:
return StringVariant (_result, TOTEM_CONE_VERSION);
return StringVariant (_result, XPLAYER_CONE_VERSION);

case eIterator:
case eLog:
case eMessages:
TOTEM_WARN_GETTER_UNIMPLEMENTED (aIndex, _result);
XPLAYER_WARN_GETTER_UNIMPLEMENTED (aIndex, _result);
return NullVariant (_result);
}

@@ -109,10 +109,10 @@ totemCone::GetPropertyByIndex (int aIndex,
}

bool
totemCone::SetPropertyByIndex (int aIndex,
xplayerCone::SetPropertyByIndex (int aIndex,
const NPVariant *aValue)
{
TOTEM_LOG_SETTER (aIndex, totemCone);
XPLAYER_LOG_SETTER (aIndex, xplayerCone);

return ThrowPropertyNotWritable ();
}

+ 10
- 10
browser-plugin/totemCone.h View File

@@ -1,4 +1,4 @@
/* Totem Cone plugin
/* Xplayer Cone plugin
*
* Copyright © 2004 Bastien Nocera <hadess@hadess.net>
* Copyright © 2002 David A. Schleef <ds@schleef.org>
@@ -20,17 +20,17 @@
* Boston, MA 02110-1301 USA.
*/

#ifndef __TOTEM_CONE__H__
#define __TOTEM_CONE__H__
#ifndef __XPLAYER_CONE__H__
#define __XPLAYER_CONE__H__

#include "totemNPClass.h"
#include "totemNPObject.h"
#include "xplayerNPClass.h"
#include "xplayerNPObject.h"

class totemCone : public totemNPObject
class xplayerCone : public xplayerNPObject
{
public:
totemCone (NPP);
virtual ~totemCone ();
xplayerCone (NPP);